[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 08/10] qapi: Avoid use of 'data' member of QAPI u
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v3 08/10] qapi: Avoid use of 'data' member of QAPI unions |
Date: |
Thu, 3 Mar 2016 09:16:50 -0700 |
QAPI code generators currently create a 'void *data' member as
part of the anonymous union embedded in the C struct corresponding
to a QAPI union. However, directly assigning to this member of
the union feels a bit fishy, when we can assign to another member
of the struct instead.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
---
v3: retitle, tweak commit message and code comment
v2: add R-b
v1: no change
Previously posted as part of qapi cleanup series F:
v6: rebase to latest
---
blockdev.c | 31 +++++++++++++++++--------------
ui/input.c | 2 +-
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index d4bc435..0f20c65 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1202,15 +1202,11 @@ void hmp_commit(Monitor *mon, const QDict *qdict)
}
}
-static void blockdev_do_action(TransactionActionKind type, void *data,
- Error **errp)
+static void blockdev_do_action(TransactionAction *action, Error **errp)
{
- TransactionAction action;
TransactionActionList list;
- action.type = type;
- action.u.data = data;
- list.value = &action;
+ list.value = action;
list.next = NULL;
qmp_transaction(&list, false, NULL, errp);
}
@@ -1236,8 +1232,11 @@ void qmp_blockdev_snapshot_sync(bool has_device, const
char *device,
.has_mode = has_mode,
.mode = mode,
};
- blockdev_do_action(TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC,
- &snapshot, errp);
+ TransactionAction action = {
+ .type = TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC,
+ .u.blockdev_snapshot_sync = &snapshot,
+ };
+ blockdev_do_action(&action, errp);
}
void qmp_blockdev_snapshot(const char *node, const char *overlay,
@@ -1247,9 +1246,11 @@ void qmp_blockdev_snapshot(const char *node, const char
*overlay,
.node = (char *) node,
.overlay = (char *) overlay
};
-
- blockdev_do_action(TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT,
- &snapshot_data, errp);
+ TransactionAction action = {
+ .type = TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT,
+ .u.blockdev_snapshot = &snapshot_data,
+ };
+ blockdev_do_action(&action, errp);
}
void qmp_blockdev_snapshot_internal_sync(const char *device,
@@ -1260,9 +1261,11 @@ void qmp_blockdev_snapshot_internal_sync(const char
*device,
.device = (char *) device,
.name = (char *) name
};
-
- blockdev_do_action(TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT_INTERNAL_SYNC,
- &snapshot, errp);
+ TransactionAction action = {
+ .type = TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT_INTERNAL_SYNC,
+ .u.blockdev_snapshot_internal_sync = &snapshot,
+ };
+ blockdev_do_action(&action, errp);
}
SnapshotInfo *qmp_blockdev_snapshot_delete_internal_sync(const char *device,
diff --git a/ui/input.c b/ui/input.c
index 13ee117..b035f86 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -470,7 +470,7 @@ InputEvent *qemu_input_event_new_move(InputEventKind kind,
InputMoveEvent *move = g_new0(InputMoveEvent, 1);
evt->type = kind;
- evt->u.data = move;
+ evt->u.rel = move; /* evt->u.rel is the same as evt->u.abs */
move->axis = axis;
move->value = value;
return evt;
--
2.5.0
- [Qemu-devel] [PATCH v3 00/10] easier unboxed visits/qapi implicit types, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 01/10] qapi: Rename 'fields' to 'members' in generator, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 04/10] qapi: Update docs to match recent generator changes, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 03/10] qapi-visit: Expose visit_type_FOO_members(), Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 09/10] chardev: Drop useless ChardevDummy type, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 02/10] qapi: Rename 'fields' to 'members' in generated C code, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 05/10] chardev: Shorten references into ChardevBackend, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 08/10] qapi: Avoid use of 'data' member of QAPI unions,
Eric Blake <=
- [Qemu-devel] [PATCH v3 10/10] qapi: Drop useless 'data' member of unions, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 06/10] util: Shorten references into SocketAddress, Eric Blake, 2016/03/03
- [Qemu-devel] [PATCH v3 07/10] ui: Shorten references into InputEvent, Eric Blake, 2016/03/03
- Re: [Qemu-devel] [PATCH v3 00/10] easier unboxed visits/qapi implicit types, Markus Armbruster, 2016/03/04