Common macros for QAPI list growth
Subsystems (4)
v4 cover Common macros for QAPI list growth
v3 was here:
https://lists.gnu.org/archive/html/qemu-devel/2020-12/msg06009.html
Since then: rebase to the patches that were already applied [Markus], address review comments [Markus, Vladimir]
001/5:[----] [--] 'net: Clarify early exit condition' 002/5:[down] 'qapi: A couple more QAPI_LIST_PREPEND() stragglers' 003/5:[0006] [FC] 'qapi: Introduce QAPI_LIST_APPEND' 004/5:[0024] [FC] 'qapi: Use QAPI_LIST_APPEND in trivial cases' 005/5:[0016] [FC] 'qapi: More complex uses of QAPI_LIST_APPEND'
Eric Blake (5):
net: Clarify early exit condition
qapi: A couple more QAPI_LIST_PREPEND() stragglers
qapi: Introduce QAPI_LIST_APPEND
qapi: Use QAPI_LIST_APPEND in trivial cases
qapi: More complex uses of QAPI_LIST_APPEND
include/qapi/util.h | 13 +++ backends/hostmem.c | 10 +-- block/dirty-bitmap.c | 8 +- block/export/export.c | 7 +- block/gluster.c | 13 +-- block/qapi.c | 37 ++------ block/qcow2-bitmap.c | 15 +--- block/vmdk.c | 9 +- blockdev.c | 13 ++- crypto/block-luks.c | 9 +- dump/dump.c | 22 ++--- hw/acpi/cpu.c | 7 +- hw/acpi/memory_hotplug.c | 8 +- hw/core/machine-qmp-cmds.c | 125 ++++++++++++---------------- hw/mem/memory-device.c | 12 +-- hw/pci/pci.c | 60 ++++--------- iothread.c | 12 +-- job-qmp.c | 13 ++- migration/migration.c | 20 ++--- monitor/hmp-cmds.c | 35 ++++---- monitor/qmp-cmds-control.c | 9 +- net/net.c | 15 +--- qemu-img.c | 8 +- qga/commands-posix.c | 125 ++++++++++------------------ qga/commands-win32.c | 99 ++++++++-------------- scsi/pr-manager.c | 10 +-- softmmu/tpm.c | 38 ++------- target/i386/cpu.c | 24 ++---- tests/test-qobject-output-visitor.c | 84 ++++++------------- tests/test-string-output-visitor.c | 6 +- ui/spice-core.c | 27 +++--- 31 files changed, 297 insertions(+), 596 deletions(-)
Signature · 1 line
2.30.0
PATCH v4 1/5 net: Clarify early exit condition
On first glance, the loop in qmp_query_rx_filter() has early return paths that could leak any allocation of filter_list from a previous iteration. But on closer inspection, it is obvious that all of the early exits are guarded by has_name, and that the bulk of the loop body can be executed at most once if the user is filtering by name, thus, any early exit coincides with an empty list. Add asserts to make this obvious.
--- net/net.c | 2 ++ 1 file changed, 2 insertions(+)
net/net.c +2 -0
@@ -1211,6 +1211,7 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name,if (nc->info->type !=NET_CLIENT_DRIVER_NIC ) {if (has_name) {error_setg (errp,"net client(%s) isn't a NIC" , name); +assert (!filter_list);return NULL ; }continue ;
@@ -1236,6 +1237,7 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name, }else if (has_name) {error_setg (errp,"net client(%s) doesn't support" " rx-filter querying" , name); +assert (!filter_list);return NULL ; }
Signature · 1 line
2.30.0
Re: [PATCH v4 1/5] net: Clarify early exit condition
Quoted 7 lines · Eric Blake
On first glance, the loop in
qmp_query_rx_filter()has early return paths that could leak any allocation offilter_listfrom a previous iteration. But on closer inspection, it is obvious that all of the early exits are guarded byhas_name, and that the bulk of the loop body can be executed at most once if the user is filtering by name, thus, any early exit coincides with an empty list. Add asserts to make this obvious.
A bit simpler (for me :) observation:
But on closer inspection, it is obvious that all of the early exits are guarded by has_name, and in case when has_name is true we leave the loop (by break) immediately after allocation and assigning filter_list for the first time.
Quoted 3 lines
Signed-off-by Eric Blake <[email protected]>Reviewed-by Markus Armbruster <[email protected]>
Quoted 24 lines
--- net/net.c | 2 ++ 1 file changed, 2 insertions(+)net/net.c +2
-0@@ -1211,6 +1211,7 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name,if (nc->info->type !=NET_CLIENT_DRIVER_NIC ) {if (has_name) {error_setg (errp,"net client(%s) isn't a NIC" , name); +assert (!filter_list);return NULL ; }continue ;@@ -1236,6 +1237,7 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name, }else if (has_name) {error_setg (errp,"net client(%s) doesn't support" " rx-filter querying" , name); +assert (!filter_list);return NULL ; }
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH v4 1/5] net: Clarify early exit condition
Quoted 9 lines · Vladimir Sementsov-Ogievskiy
Quoted 7 lines · Eric Blake
On first glance, the loop in
qmp_query_rx_filter()has early return paths that could leak any allocation offilter_listfrom a previous iteration. But on closer inspection, it is obvious that all of the early exits are guarded byhas_name, and that the bulk of the loop body can be executed at most once if the user is filtering by name, thus, any early exit coincides with an empty list. Add asserts to make this obvious.
Quoted 4 lines
A bit simpler (for me :) observation:
But on closer inspection, it is obvious that all of the early exits are guarded by
has_name, and in case whenhas_nameis true we leave the loop
s/in case//
Quoted 2 lines
(by break) immediately after allocation and assigning
filter_listfor the first time.
Replacing my wording with this touched-up sentence is fine with me, if Markus would like to tweak the queued commit to incorporate it.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v4 2/5 qapi: A couple more QAPI_LIST_PREPEND() stragglers
In reply to Eric BlakeCommit 54aa3de72e switched multiple sites to use QAPI_LIST_PREPEND instead of open-coding, but missed a couple of spots.
--- hw/core/machine-qmp-cmds.c | 32 +++++++++++--------------------- monitor/qmp-cmds-control.c | 9 ++++----- 2 files changed, 15 insertions(+), 26 deletions(-)
hw/core/machine-qmp-cmds.c +11 -21
@@ -293,41 +293,31 @@ void qmp_set_numa_node(NumaOptions *cmd, Error **errp)static int query_memdev (Object *obj,void *opaque) {MemdevList **list = opaque; -MemdevList *m =NULL ; +Memdev *m;QObject *host_nodes;Visitor *v;if (object_dynamic_cast (obj,TYPE_MEMORY_BACKEND )) { m =g_malloc0 (sizeof (*m)); - m->value =g_malloc0 (sizeof (*m->value)); + m->id =g_strdup (object_get_canonical_path_component (obj)); + m->has_id = !!m->id; - m->value->id =g_strdup (object_get_canonical_path_component (obj)); - m->value->has_id = !!m->value->id; - - m->value->size =object_property_get_uint (obj,"size" , - &error_abort); - m->value->merge =object_property_get_bool (obj,"merge" , - &error_abort); - m->value->dump =object_property_get_bool (obj,"dump" , - &error_abort); - m->value->prealloc =object_property_get_bool (obj, -"prealloc" , - &error_abort); - m->value->policy =object_property_get_enum (obj, -"policy" , -"HostMemPolicy" , - &error_abort); + m->size =object_property_get_uint (obj,"size" , &error_abort); + m->merge =object_property_get_bool (obj,"merge" , &error_abort); + m->dump =object_property_get_bool (obj,"dump" , &error_abort); + m->prealloc =object_property_get_bool (obj,"prealloc" , &error_abort); + m->policy =object_property_get_enum (obj,"policy" ,"HostMemPolicy" , + &error_abort); host_nodes =object_property_get_qobject (obj,"host-nodes" , &error_abort); v =qobject_input_visitor_new (host_nodes); -visit_type_uint16List (v,NULL , &m->value->host_nodes, &error_abort); +visit_type_uint16List (v,NULL , &m->host_nodes, &error_abort);visit_free (v);qobject_unref (host_nodes); - m->next = *list; - *list = m; +QAPI_LIST_PREPEND (*list, m); }return 0 ;
monitor/qmp-cmds-control.c +4 -5
@@ -104,17 +104,16 @@ VersionInfo *qmp_query_version(Error **errp)static void query_commands_cb (const QmpCommand *cmd,void *opaque) { -CommandInfoList *info, **list = opaque; +CommandInfo *info; +CommandInfoList **list = opaque;if (!cmd->enabled) {return ; } info =g_malloc0 (sizeof (*info)); - info->value =g_malloc0 (sizeof (*info->value)); - info->value->name =g_strdup (cmd->name); - info->next = *list; - *list = info; + info->name =g_strdup (cmd->name); +QAPI_LIST_PREPEND (*list, info); }CommandInfoList *qmp_query_commands (Error **errp)
Signature · 1 line
2.30.0
Re: [PATCH v4 2/5] qapi: A couple more QAPI_LIST_PREPEND() stragglers
Quoted 4 lines · Eric Blake
Commit
54aa3de72eswitched multiple sites to useQAPI_LIST_PREPENDinstead of open-coding, but missed a couple of spots.Signed-off-by Eric Blake<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH v4 3/5 qapi: Introduce QAPI_LIST_APPEND
In reply to Eric BlakeSimilar to the existing QAPI_LIST_PREPEND, but designed for use where we want to preserve insertion order. Callers will be added in upcoming patches. Note the difference in signature: PREPEND takes List*, APPEND takes List**.
--- include/qapi/util.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)
include/qapi/util.h +13 -0
@@ -37,4 +37,17 @@ int parse_qapi_name(const char *name, bool complete); (list) = _tmp; \ } while (0) +/* +* For any pointer to a GenericList @tail (usually the 'next' member of a +* list element), insert @element at the back and update the tail. +* +* Note that this macro evaluates @element exactly once, so it is safe +* to have side-effects with that argument. + */ +#define QAPI_LIST_APPEND (tail, element) do { \ + *(tail) = g_malloc0(sizeof(**(tail))); \ + (*(tail))->value = (element); \ + (tail) = &(*(tail))->next; \ +} while (0) +#endif
Signature · 1 line
2.30.0
Re: [PATCH v4 3/5] qapi: Introduce QAPI_LIST_APPEND
Quoted 7 lines · Eric Blake
Similar to the existing
QAPI_LIST_PREPEND, but designed for use where we want to preserve insertion order. Callers will be added in upcoming patches. Note the difference in signature: PREPEND takes List*, APPEND takes List**.Signed-off-by Eric Blake <[email protected]>Reviewed-by Vladimir Sementsov-Ogievskiy <[email protected]>
PATCH v4 4/5 qapi: Use QAPI_LIST_APPEND in trivial cases
In reply to Eric BlakeThe easiest spots to use QAPI_LIST_APPEND are where we already have an obvious pointer to the tail of a list. While at it, consistently use the variable name 'tail' for that purpose.
---
move another hunk to PREPEND patch [Vladimir]
parameter naming [Markus]
--- backends/hostmem.c | 10 ++-- block/dirty-bitmap.c | 8 ++- block/export/export.c | 7 +-- block/qapi.c | 23 ++------ block/qcow2-bitmap.c | 15 ++---- block/vmdk.c | 9 ++-- blockdev.c | 13 ++--- crypto/block-luks.c | 9 ++-- hw/acpi/cpu.c | 7 +-- hw/acpi/memory_hotplug.c | 8 ++- iothread.c | 12 ++--- job-qmp.c | 13 ++--- monitor/hmp-cmds.c | 10 ++-- qemu-img.c | 8 +-- qga/commands-posix.c | 31 ++++------- qga/commands-win32.c | 11 ++-- scsi/pr-manager.c | 10 +--- target/i386/cpu.c | 24 +++------ tests/test-qobject-output-visitor.c | 84 +++++++++-------------------- tests/test-string-output-visitor.c | 6 +-- 20 files changed, 96 insertions(+), 222 deletions(-)
backends/hostmem.c +3 -7
@@ -80,7 +80,7 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name, {HostMemoryBackend *backend =MEMORY_BACKEND (obj);uint16List *host_nodes =NULL ; -uint16List **node = &host_nodes; +uint16List **tail = &host_nodes;unsigned long value; value =find_first_bit (backend->host_nodes,MAX_NODES );
@@ -88,9 +88,7 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name, goto ret; } - *node =g_malloc0 (sizeof (**node)); - (*node)->value = value; - node = &(*node)->next; +QAPI_LIST_APPEND (tail, value); do { value = find_next_bit(backend->host_nodes, MAX_NODES, value + 1);
@@ -98,9 +96,7 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name,break ; } - *node =g_malloc0 (sizeof (**node)); - (*node)->value = value; - node = &(*node)->next; +QAPI_LIST_APPEND (tail, value); }while (true); ret:
block/dirty-bitmap.c +3 -5
@@ -572,12 +572,12 @@ BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs) {BdrvDirtyBitmap *bm;BlockDirtyInfoList *list =NULL ; -BlockDirtyInfoList **plist = &list; +BlockDirtyInfoList **tail = &list;bdrv_dirty_bitmaps_lock (bs); QLIST_FOREACH(bm, &bs->dirty_bitmaps, list) {BlockDirtyInfo *info =g_new0 (BlockDirtyInfo,1 ); -BlockDirtyInfoList *entry =g_new0 (BlockDirtyInfoList,1 ); + info->count =bdrv_get_dirty_count (bm); info->granularity =bdrv_dirty_bitmap_granularity (bm); info->has_name = !!bm->name;
@@ -588,9 +588,7 @@ BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs) info->persistent = bm->persistent; info->has_inconsistent = bm->inconsistent; info->inconsistent = bm->inconsistent; - entry->value = info; - *plist = entry; - plist = &entry->next; +QAPI_LIST_APPEND (tail, info); }bdrv_dirty_bitmaps_unlock (bs);
block/export/export.c +2 -5
@@ -342,11 +342,10 @@ void qmp_block_export_del(const char *id,BlockExportInfoList *qmp_query_block_exports (Error **errp) { -BlockExportInfoList *head =NULL , **p_next = &head; +BlockExportInfoList *head =NULL , **tail = &head;BlockExport *exp; QLIST_FOREACH(exp, &block_exports, next) { -BlockExportInfoList *entry =g_new0 (BlockExportInfoList,1 );BlockExportInfo *info =g_new (BlockExportInfo,1 ); *info = (BlockExportInfo ) { .id = g_strdup(exp->id),
@@ -355,9 +354,7 @@ BlockExportInfoList *qmp_query_block_exports(Error **errp) .shutting_down = !exp->user_owned, }; - entry->value = info; - *p_next = entry; - p_next = &entry->next; +QAPI_LIST_APPEND (tail, info); }return head;
block/qapi.c +5 -18
@@ -418,17 +418,12 @@ static uint64List *uint64_list(uint64_t *list, int size) {int i;uint64List *out_list =NULL ; -uint64List **pout_list = &out_list; +uint64List **tail = &out_list;for (i =0 ; i < size; i++) { -uint64List *entry =g_new (uint64List,1 ); - entry->value = list[i]; - *pout_list = entry; - pout_list = &entry->next; +QAPI_LIST_APPEND (tail, list[i]); } - *pout_list =NULL ; -return out_list; }
@@ -636,26 +631,21 @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes,bool query_nodes, Error **errp) { - BlockStatsList *head = NULL, **p_next = &head; + BlockStatsList *head = NULL, **tail = &head;BlockBackend *blk;BlockDriverState *bs;/* Just to be safe if query_nodes is not always initialized */ if (has_query_nodes && query_nodes) {for (bs =bdrv_next_node (NULL ); bs; bs =bdrv_next_node (bs)) { -BlockStatsList *info =g_malloc0 (sizeof (*info));AioContext *ctx =bdrv_get_aio_context (bs);aio_context_acquire (ctx); - info->value =bdrv_query_bds_stats (bs, false); +QAPI_LIST_APPEND (tail,bdrv_query_bds_stats (bs, false));aio_context_release (ctx); - - *p_next = info; - p_next = &info->next; } }else {for (blk =blk_all_next (NULL ); blk; blk =blk_all_next (blk)) { -BlockStatsList *info;AioContext *ctx =blk_get_aio_context (blk);BlockStats *s;char *qdev;
@@ -680,10 +670,7 @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes,bdrv_query_blk_stats (s->stats, blk);aio_context_release (ctx); - info =g_malloc0 (sizeof (*info)); - info->value = s; - *p_next = info; - p_next = &info->next; +QAPI_LIST_APPEND (tail, s); } }
block/qcow2-bitmap.c +4 -11
@@ -1061,7 +1061,7 @@ fail:static Qcow2BitmapInfoFlagsList *get_bitmap_info_flags (uint32_t flags) {Qcow2BitmapInfoFlagsList *list =NULL ; -Qcow2BitmapInfoFlagsList **plist = &list; +Qcow2BitmapInfoFlagsList **tail = &list;int i; static const struct {
@@ -1076,11 +1076,7 @@ static Qcow2BitmapInfoFlagsList *get_bitmap_info_flags(uint32_t flags)for (i =0 ; i < map_size; ++i) {if (flags & map[i].bme) { -Qcow2BitmapInfoFlagsList *entry = -g_new0 (Qcow2BitmapInfoFlagsList,1 ); - entry->value = map[i].info; - *plist = entry; - plist = &entry->next; +QAPI_LIST_APPEND (tail, map[i].info); flags &= ~map[i].bme; } }
@@ -1105,7 +1101,7 @@ Qcow2BitmapInfoList *qcow2_get_bitmap_info_list(BlockDriverState *bs,Qcow2BitmapList *bm_list;Qcow2Bitmap *bm;Qcow2BitmapInfoList *list =NULL ; -Qcow2BitmapInfoList **plist = &list; +Qcow2BitmapInfoList **tail = &list;if (s->nb_bitmaps ==0 ) {return NULL ;
@@ -1119,13 +1115,10 @@ Qcow2BitmapInfoList *qcow2_get_bitmap_info_list(BlockDriverState *bs, QSIMPLEQ_FOREACH(bm, bm_list, entry) {Qcow2BitmapInfo *info =g_new0 (Qcow2BitmapInfo,1 ); -Qcow2BitmapInfoList *obj =g_new0 (Qcow2BitmapInfoList,1 ); info->granularity =1U << bm->granularity_bits; info->name =g_strdup (bm->name); info->flags =get_bitmap_info_flags (bm->flags & ~BME_RESERVED_FLAGS ); - obj->value = info; - *plist = obj; - plist = &obj->next; +QAPI_LIST_APPEND (tail, info); }bitmap_list_free (bm_list);
block/vmdk.c +3 -6
@@ -2928,7 +2928,7 @@ static ImageInfoSpecific *vmdk_get_specific_info(BlockDriverState *bs,int i;BDRVVmdkState *s = bs->opaque;ImageInfoSpecific *spec_info =g_new0 (ImageInfoSpecific,1 ); -ImageInfoList **next; +ImageInfoList **tail; *spec_info = (ImageInfoSpecific ){ .type =IMAGE_INFO_SPECIFIC_KIND_VMDK ,
@@ -2943,12 +2943,9 @@ static ImageInfoSpecific *vmdk_get_specific_info(BlockDriverState *bs, .parent_cid = s->parent_cid, }; - next = &spec_info->u.vmdk.data->extents; + tail = &spec_info->u.vmdk.data->extents;for (i =0 ; i < s->num_extents; i++) { - *next =g_new0 (ImageInfoList,1 ); - (*next)->value =vmdk_get_extent_info (&s->extents[i]); - (*next)->next =NULL ; - next = &(*next)->next; +QAPI_LIST_APPEND (tail,vmdk_get_extent_info (&s->extents[i])); }return spec_info;
blockdev.c +5 -8
@@ -3676,28 +3676,25 @@ void qmp_x_blockdev_change(const char *parent, bool has_child,BlockJobInfoList *qmp_query_block_jobs (Error **errp) { -BlockJobInfoList *head =NULL , **p_next = &head; +BlockJobInfoList *head =NULL , **tail = &head;BlockJob *job;for (job =block_job_next (NULL ); job; job =block_job_next (job)) { -BlockJobInfoList *elem; +BlockJobInfo *value;AioContext *aio_context;if (block_job_is_internal (job)) {continue ; } - elem =g_new0 (BlockJobInfoList,1 ); aio_context =blk_get_aio_context (job->blk);aio_context_acquire (aio_context); - elem->value =block_job_query (job, errp); + value =block_job_query (job, errp);aio_context_release (aio_context); -if (!elem->value) { -g_free (elem); +if (!value) {qapi_free_BlockJobInfoList (head);return NULL ; } - *p_next = elem; - p_next = &elem->next; +QAPI_LIST_APPEND (tail, value); }return head;
crypto/block-luks.c +3 -6
@@ -1885,7 +1885,7 @@ static int qcrypto_block_luks_get_info(QCryptoBlock *block, {QCryptoBlockLUKS *luks = block->opaque;QCryptoBlockInfoLUKSSlot *slot; -QCryptoBlockInfoLUKSSlotList *slots =NULL , **prev = &info->u.luks.slots; +QCryptoBlockInfoLUKSSlotList **tail = &info->u.luks.slots;size_t i; info->u.luks.cipher_alg = luks->cipher_alg;
@@ -1902,10 +1902,7 @@ static int qcrypto_block_luks_get_info(QCryptoBlock *block, sizeof(luks->header.uuid));for (i =0 ; i <QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS ; i++) { - slots =g_new0 (QCryptoBlockInfoLUKSSlotList,1 ); - *prev = slots; - - slots->value = slot =g_new0 (QCryptoBlockInfoLUKSSlot,1 ); + slot =g_new0 (QCryptoBlockInfoLUKSSlot,1 ); slot->active = luks->header.key_slots[i].active ==QCRYPTO_BLOCK_LUKS_KEY_SLOT_ENABLED ; slot->key_offset = luks->header.key_slots[i].key_offset_sector
@@ -1917,7 +1914,7 @@ static int qcrypto_block_luks_get_info(QCryptoBlock *block, slot->stripes = luks->header.key_slots[i].stripes; } - prev = &slots->next; +QAPI_LIST_APPEND (tail, slot); }return 0 ;
hw/acpi/cpu.c +2 -5
@@ -44,14 +44,11 @@ static ACPIOSTInfo *acpi_cpu_device_status(int idx, AcpiCpuStatus *cdev)void acpi_cpu_ospm_status (CPUHotplugState *cpu_st,ACPIOSTInfoList ***list) { +ACPIOSTInfoList ***tail = list;int i;for (i =0 ; i < cpu_st->dev_count; i++) { -ACPIOSTInfoList *elem =g_new0 (ACPIOSTInfoList,1 ); - elem->value =acpi_cpu_device_status (i, &cpu_st->devs[i]); - elem->next =NULL ; - **list = elem; - *list = &elem->next; +QAPI_LIST_APPEND (*tail,acpi_cpu_device_status (i, &cpu_st->devs[i])); } }
hw/acpi/memory_hotplug.c +3 -5
@@ -53,14 +53,12 @@ static ACPIOSTInfo *acpi_memory_device_status(int slot, MemStatus *mdev)void acpi_memory_ospm_status (MemHotplugState *mem_st,ACPIOSTInfoList ***list) { +ACPIOSTInfoList ***tail = list;int i;for (i =0 ; i < mem_st->dev_count; i++) { -ACPIOSTInfoList *elem =g_new0 (ACPIOSTInfoList,1 ); - elem->value =acpi_memory_device_status (i, &mem_st->devs[i]); - elem->next =NULL ; - **list = elem; - *list = &elem->next; +QAPI_LIST_APPEND (*tail, +acpi_memory_device_status (i, &mem_st->devs[i])); } }
iothread.c +3 -9
@@ -1,7 +1,7 @@/* * Event loop thread * -* Copyright Red Hat Inc., 2013 +* Copyright Red Hat Inc., 2013, 2020 * * Authors: * Stefan Hajnoczi <[email protected]>
@@ -310,8 +310,7 @@ AioContext *iothread_get_aio_context(IOThread *iothread)static int query_one_iothread (Object *object,void *opaque) { -IOThreadInfoList ***prev = opaque; -IOThreadInfoList *elem; +IOThreadInfoList ***tail = opaque;IOThreadInfo *info;IOThread *iothread;
@@ -327,12 +326,7 @@ static int query_one_iothread(Object *object, void *opaque) info->poll_grow = iothread->poll_grow; info->poll_shrink = iothread->poll_shrink; - elem =g_new0 (IOThreadInfoList,1 ); - elem->value = info; - elem->next =NULL ; - - **prev = elem; - *prev = &elem->next; +QAPI_LIST_APPEND (*tail, info);return 0 ; }
job-qmp.c +5 -8
@@ -164,28 +164,25 @@ static JobInfo *job_query_single(Job *job, Error **errp)JobInfoList *qmp_query_jobs (Error **errp) { -JobInfoList *head =NULL , **p_next = &head; +JobInfoList *head =NULL , **tail = &head;Job *job;for (job =job_next (NULL ); job; job =job_next (job)) { -JobInfoList *elem; +JobInfo *value;AioContext *aio_context;if (job_is_internal (job)) {continue ; } - elem =g_new0 (JobInfoList,1 ); aio_context = job->aio_context;aio_context_acquire (aio_context); - elem->value =job_query_single (job, errp); + value =job_query_single (job, errp);aio_context_release (aio_context); -if (!elem->value) { -g_free (elem); +if (!value) {qapi_free_JobInfoList (head);return NULL ; } - *p_next = elem; - p_next = &elem->next; +QAPI_LIST_APPEND (tail, value); }return head;
monitor/hmp-cmds.c +5 -5
@@ -76,20 +76,20 @@ void hmp_handle_error(Monitor *mon, Error *err)static strList *strList_from_comma_list (const char *in) {strList *res =NULL ; -strList **hook = &res; +strList **tail = &res;while (in && in[0 ]) {char *comma =strchr (in,',' ); - *hook =g_new0 (strList,1 ); +char *value;if (comma) { - (*hook)->value =g_strndup (in, comma - in); + value =g_strndup (in, comma - in); in = comma +1 ;/* skip the , */ }else { - (*hook)->value =g_strdup (in); + value =g_strdup (in); in =NULL ; } - hook = &(*hook)->next; +QAPI_LIST_APPEND (tail, value); }return res;
qemu-img.c +2 -6
@@ -2856,7 +2856,7 @@ static ImageInfoList *collect_image_info_list(bool image_opts, bool chain, bool force_share) {ImageInfoList *head =NULL ; -ImageInfoList **last = &head; +ImageInfoList **tail = &head;GHashTable *filenames;Error *err =NULL ;
@@ -2866,7 +2866,6 @@ static ImageInfoList *collect_image_info_list(bool image_opts,BlockBackend *blk;BlockDriverState *bs;ImageInfo *info; -ImageInfoList *elem;if (g_hash_table_lookup_extended (filenames, filename,NULL ,NULL )) { error_report("Backing file '%s' creates an infinite loop.",
@@ -2890,10 +2889,7 @@ static ImageInfoList *collect_image_info_list(bool image_opts, goto err; } - elem =g_new0 (ImageInfoList,1 ); - elem->value = info; - *last = elem; - last = &elem->next; +QAPI_LIST_APPEND (tail, info);blk_unref (blk);
qga/commands-posix.c +9 -22
@@ -2474,18 +2474,17 @@ static void transfer_vcpu(GuestLogicalProcessor *vcpu, bool sys2vcpu,GuestLogicalProcessorList *qmp_guest_get_vcpus (Error **errp) {int64_t current; -GuestLogicalProcessorList *head, **link; +GuestLogicalProcessorList *head, **tail;long sc_max;Error *local_err =NULL ; current =0 ; head =NULL ; - link = &head; + tail = &head; sc_max =SYSCONF_EXACT (_SC_NPROCESSORS_CONF, &local_err);while (local_err ==NULL && current < sc_max) {GuestLogicalProcessor *vcpu; -GuestLogicalProcessorList *entry;int64_t id = current++;char *path =g_strdup_printf ("/sys/devices/system/cpu/cpu%" PRId64"/" , id);
@@ -2495,10 +2494,7 @@ GuestLogicalProcessorList *qmp_guest_get_vcpus(Error **errp) vcpu->logical_id = id; vcpu->has_can_offline = true;/* lolspeak ftw */ transfer_vcpu (vcpu, true, path, &local_err); - entry =g_malloc0 (sizeof *entry); - entry->value = vcpu; - *link = entry; - link = &entry->next; +QAPI_LIST_APPEND (tail, vcpu); }g_free (path); }
@@ -2831,13 +2827,13 @@ out1:GuestMemoryBlockList *qmp_guest_get_memory_blocks (Error **errp) { -GuestMemoryBlockList *head, **link; +GuestMemoryBlockList *head, **tail;Error *local_err =NULL ;struct dirent *de;DIR *dp; head =NULL ; - link = &head; + tail = &head; dp =opendir ("/sys/devices/system/memory/" );if (!dp) {
@@ -2859,7 +2855,6 @@ GuestMemoryBlockList *qmp_guest_get_memory_blocks(Error **errp)*/ while ((de =readdir (dp)) !=NULL ) {GuestMemoryBlock *mem_blk; -GuestMemoryBlockList *entry;if ((strncmp (de->d_name,"memory" ,6 ) !=0 ) || !(de->d_type &DT_DIR )) {
@@ -2875,11 +2870,7 @@ GuestMemoryBlockList *qmp_guest_get_memory_blocks(Error **errp)break ; } - entry =g_malloc0 (sizeof *entry); - entry->value = mem_blk; - - *link = entry; - link = &entry->next; +QAPI_LIST_APPEND (tail, mem_blk); }closedir (dp);
@@ -2899,15 +2890,14 @@ GuestMemoryBlockList *qmp_guest_get_memory_blocks(Error **errp)GuestMemoryBlockResponseList *qmp_guest_set_memory_blocks (GuestMemoryBlockList *mem_blks,Error **errp) { -GuestMemoryBlockResponseList *head, **link; +GuestMemoryBlockResponseList *head, **tail;Error *local_err =NULL ; head =NULL ; - link = &head; + tail = &head;while (mem_blks !=NULL ) {GuestMemoryBlockResponse *result; -GuestMemoryBlockResponseList *entry;GuestMemoryBlock *current_mem_blk = mem_blks->value; result =g_malloc0 (sizeof (*result));
@@ -2916,11 +2906,8 @@ qmp_guest_set_memory_blocks(GuestMemoryBlockList *mem_blks, Error **errp)if (local_err) {/* should never happen */ goto err; } - entry =g_malloc0 (sizeof *entry); - entry->value = result; - *link = entry; - link = &entry->next; +QAPI_LIST_APPEND (tail, result); mem_blks = mem_blks->next; }
qga/commands-win32.c +3 -8
@@ -1833,7 +1833,7 @@ GuestLogicalProcessorList *qmp_guest_get_vcpus(Error **errp) {PSYSTEM_LOGICAL_PROCESSOR_INFORMATION pslpi, ptr;DWORD length; -GuestLogicalProcessorList *head, **link; +GuestLogicalProcessorList *head, **tail;Error *local_err =NULL ;int64_t current;
@@ -1841,7 +1841,7 @@ GuestLogicalProcessorList *qmp_guest_get_vcpus(Error **errp) length =0 ; current =0 ; head =NULL ; - link = &head; + tail = &head; if ((GetLogicalProcessorInformation(pslpi, &length) == FALSE) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) &&
@@ -1864,18 +1864,13 @@ GuestLogicalProcessorList *qmp_guest_get_vcpus(Error **errp)while (cpu_bits >0 ) {if (!!(cpu_bits &1 )) {GuestLogicalProcessor *vcpu; -GuestLogicalProcessorList *entry; vcpu =g_malloc0 (sizeof *vcpu); vcpu->logical_id = current++; vcpu->online = true; vcpu->has_can_offline = true; - entry =g_malloc0 (sizeof *entry); - entry->value = vcpu; - - *link = entry; - link = &entry->next; +QAPI_LIST_APPEND (tail, vcpu); } cpu_bits >>=1 ; }
scsi/pr-manager.c +2 -8
@@ -116,8 +116,7 @@ pr_manager_register_types(void)static int query_one_pr_manager (Object *object,void *opaque) { -PRManagerInfoList ***prev = opaque; -PRManagerInfoList *elem; +PRManagerInfoList ***tail = opaque;PRManagerInfo *info;PRManager *pr_mgr;
@@ -126,15 +125,10 @@ static int query_one_pr_manager(Object *object, void *opaque)return 0 ; } - elem =g_new0 (PRManagerInfoList,1 ); info =g_new0 (PRManagerInfo,1 ); info->id =g_strdup (object_get_canonical_path_component (object)); info->connected =pr_manager_is_connected (pr_mgr); - elem->value = info; - elem->next =NULL ; - - **prev = elem; - *prev = &elem->next; +QAPI_LIST_APPEND (*tail, info);return 0 ; }
target/i386/cpu.c +8 -16
@@ -4817,20 +4817,17 @@ static void x86_cpu_filter_features(X86CPU *cpu, bool verbose);/* Build a list with the name of all features on a feature word array */ static void x86_cpu_list_feature_names (FeatureWordArray features, -strList **feat_names) +strList **list) { +strList **tail = list;FeatureWord w; -strList **next = feat_names;for (w =0 ; w <FEATURE_WORDS ; w++) {uint64_t filtered = features[w];int i;for (i =0 ; i <64 ; i++) {if (filtered & (1ULL << i)) { -strList *new =g_new0 (strList,1 ); - new->value =g_strdup (x86_cpu_feature_name (w, i)); - *next = new; - next = &new->next; +QAPI_LIST_APPEND (tail,g_strdup (x86_cpu_feature_name (w, i))); } } }
@@ -4851,16 +4848,14 @@ static void x86_cpu_get_unavailable_features(Object *obj, Visitor *v,* running using the current machine and accelerator. */ static void x86_cpu_class_check_missing_features (X86CPUClass *xcc, -strList **missing_feats) +strList **list) { +strList **tail = list;X86CPU *xc;Error *err =NULL ; -strList **next = missing_feats;if (xcc->host_cpuid_required && !accel_uses_host_cpuid ()) { -strList *new =g_new0 (strList,1 ); - new->value =g_strdup ("kvm" ); - *missing_feats = new; +QAPI_LIST_APPEND (tail,g_strdup ("kvm" ));return ; }
@@ -4872,16 +4867,13 @@ static void x86_cpu_class_check_missing_features(X86CPUClass *xcc,* but in case it does, just report the model as not * runnable at all using the "type" property. */ -strList *new =g_new0 (strList,1 ); - new->value =g_strdup ("type" ); - *next = new; - next = &new->next; +QAPI_LIST_APPEND (tail,g_strdup ("type" ));error_free (err); }x86_cpu_filter_features (xc, false); -x86_cpu_list_feature_names (xc->filtered_features, next); +x86_cpu_list_feature_names (xc->filtered_features, tail);object_unref (OBJECT (xc)); }
tests/test-qobject-output-visitor.c +24 -60
146 lines not on this page · raw message
tests/test-string-output-visitor.c +2 -4
@@ -88,15 +88,13 @@ static void test_visitor_out_intList(TestOutputVisitorData *data, {int64_t value[] = {0 ,1 ,9 ,10 ,16 ,15 ,14 ,3 ,4 ,5 ,6 ,11 ,12 ,13 ,21 ,22 ,INT64_MAX -1 ,INT64_MAX }; -intList *list =NULL , **tmp = &list; +intList *list =NULL , **tail = &list;int i;Error *err =NULL ;char *str;for (i =0 ; i <ARRAY_SIZE (value); i++) { - *tmp =g_malloc0 (sizeof (**tmp)); - (*tmp)->value = value[i]; - tmp = &(*tmp)->next; +QAPI_LIST_APPEND (tail, value[i]); }visit_type_intList (data->ov,NULL , &list, &err);
Signature · 1 line
2.30.0
PATCH v4 5/5 qapi: More complex uses of QAPI_LIST_APPEND
In reply to Eric BlakeThese cases require a bit more thought to review; in each case, the code was appending to a list, but not with a FOOList **tail variable.
---
fix qmp_guest_network_get_interfaces [Vladimir]
--- block/gluster.c | 13 ++---- block/qapi.c | 14 +----- dump/dump.c | 22 +++------ hw/core/machine-qmp-cmds.c | 93 ++++++++++++++++--------------------- hw/mem/memory-device.c | 12 +---- hw/pci/pci.c | 60 ++++++++---------------- migration/migration.c | 20 +++----- monitor/hmp-cmds.c | 25 ++++------ net/net.c | 13 +----- qga/commands-posix.c | 94 +++++++++++++++----------------------- qga/commands-win32.c | 88 ++++++++++++----------------------- softmmu/tpm.c | 38 +++------------ ui/spice-core.c | 27 ++++------- 13 files changed, 171 insertions(+), 348 deletions(-)
block/gluster.c +3 -10
@@ -514,7 +514,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, {QemuOpts *opts;SocketAddress *gsconf =NULL ; -SocketAddressList *curr =NULL ; +SocketAddressList **tail;QDict *backing_options =NULL ;Error *local_err =NULL ;char *str =NULL ;
@@ -547,6 +547,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, } gconf->path =g_strdup (ptr);qemu_opts_del (opts); + tail = &gconf->server;for (i =0 ; i < num_servers; i++) { str =g_strdup_printf (GLUSTER_OPT_SERVER_PATTERN "%d." , i);
@@ -655,15 +656,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,qemu_opts_del (opts); } -if (gconf->server ==NULL ) { - gconf->server =g_new0 (SocketAddressList,1 ); - gconf->server->value = gsconf; - curr = gconf->server; - }else { - curr->next =g_new0 (SocketAddressList,1 ); - curr->next->value = gsconf; - curr = curr->next; - } +QAPI_LIST_APPEND (tail, gsconf); gsconf =NULL ;qobject_unref (backing_options);
block/qapi.c +2 -12
@@ -198,7 +198,7 @@ int bdrv_query_snapshot_info_list(BlockDriverState *bs, {int i, sn_count;QEMUSnapshotInfo *sn_tab =NULL ; -SnapshotInfoList *info_list, *cur_item =NULL , *head =NULL ; +SnapshotInfoList *head =NULL , **tail = &head;SnapshotInfo *info; sn_count =bdrv_snapshot_list (bs, &sn_tab);
@@ -233,17 +233,7 @@ int bdrv_query_snapshot_info_list(BlockDriverState *bs, info->icount = sn_tab[i].icount; info->has_icount = sn_tab[i].icount !=-1ULL ; - info_list =g_new0 (SnapshotInfoList,1 ); - info_list->value = info; - -/* XXX: waiting for the qapi to support qemu-queue.h types */ -if (!cur_item) { - head = cur_item = info_list; - }else { - cur_item->next = info_list; - cur_item = info_list; - } - +QAPI_LIST_APPEND (tail, info); }g_free (sn_tab);
dump/dump.c +6 -16
@@ -2030,39 +2030,29 @@ void qmp_dump_guest_memory(bool paging, const char *file,DumpGuestMemoryCapability *qmp_query_dump_guest_memory_capability (Error **errp) { -DumpGuestMemoryFormatList *item;DumpGuestMemoryCapability *cap =g_malloc0 (sizeof (DumpGuestMemoryCapability)); +DumpGuestMemoryFormatList **tail = &cap->formats;/* elf is always available */ - item =g_malloc0 (sizeof (DumpGuestMemoryFormatList)); - cap->formats = item; - item->value =DUMP_GUEST_MEMORY_FORMAT_ELF ; +QAPI_LIST_APPEND (tail,DUMP_GUEST_MEMORY_FORMAT_ELF );/* kdump-zlib is always available */ - item->next =g_malloc0 (sizeof (DumpGuestMemoryFormatList)); - item = item->next; - item->value =DUMP_GUEST_MEMORY_FORMAT_KDUMP_ZLIB ; +QAPI_LIST_APPEND (tail,DUMP_GUEST_MEMORY_FORMAT_KDUMP_ZLIB );/* add new item if kdump-lzo is available */ #ifdef CONFIG_LZO - item->next =g_malloc0 (sizeof (DumpGuestMemoryFormatList)); - item = item->next; - item->value =DUMP_GUEST_MEMORY_FORMAT_KDUMP_LZO ; +QAPI_LIST_APPEND (tail,DUMP_GUEST_MEMORY_FORMAT_KDUMP_LZO );#endif /* add new item if kdump-snappy is available */ #ifdef CONFIG_SNAPPY - item->next =g_malloc0 (sizeof (DumpGuestMemoryFormatList)); - item = item->next; - item->value =DUMP_GUEST_MEMORY_FORMAT_KDUMP_SNAPPY ; +QAPI_LIST_APPEND (tail,DUMP_GUEST_MEMORY_FORMAT_KDUMP_SNAPPY );#endif /* Windows dump is available only if target is x86_64 */ #ifdef TARGET_X86_64 - item->next =g_malloc0 (sizeof (DumpGuestMemoryFormatList)); - item = item->next; - item->value =DUMP_GUEST_MEMORY_FORMAT_WIN_DMP ; +QAPI_LIST_APPEND (tail,DUMP_GUEST_MEMORY_FORMAT_WIN_DMP );#endif return cap;
hw/core/machine-qmp-cmds.c +40 -53
143 lines not on this page · raw message
hw/mem/memory-device.c +2 -10
@@ -199,7 +199,7 @@ out:MemoryDeviceInfoList *qmp_memory_device_list (void ) {GSList *devices =NULL , *item; -MemoryDeviceInfoList *list =NULL , *prev =NULL ; +MemoryDeviceInfoList *list =NULL , **tail = &list;object_child_foreach (qdev_get_machine (), memory_device_build_list, &devices);
@@ -207,19 +207,11 @@ MemoryDeviceInfoList *qmp_memory_device_list(void)for (item = devices; item; item =g_slist_next (item)) {const MemoryDeviceState *md =MEMORY_DEVICE (item->data);const MemoryDeviceClass *mdc =MEMORY_DEVICE_GET_CLASS (item->data); -MemoryDeviceInfoList *elem =g_new0 (MemoryDeviceInfoList,1 );MemoryDeviceInfo *info =g_new0 (MemoryDeviceInfo,1 ); mdc->fill_device_info (md, info); - elem->value = info; - elem->next =NULL ; -if (prev) { - prev->next = elem; - }else { - list = elem; - } - prev = elem; +QAPI_LIST_APPEND (tail, info); }g_slist_free (devices);
hw/pci/pci.c +18 -42
103 lines not on this page · raw message
migration/migration.c +6 -14
@@ -793,29 +793,21 @@ void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value)MigrationCapabilityStatusList *qmp_query_migrate_capabilities (Error **errp) { -MigrationCapabilityStatusList *head =NULL ; -MigrationCapabilityStatusList *caps; +MigrationCapabilityStatusList *head =NULL , **tail = &head; +MigrationCapabilityStatus *caps;MigrationState *s =migrate_get_current ();int i; - caps =NULL ;/* silence compiler warning */ for (i =0 ; i <MIGRATION_CAPABILITY__MAX ; i++) {#ifndef CONFIG_LIVE_BLOCK_MIGRATION if (i ==MIGRATION_CAPABILITY_BLOCK ) {continue ; }#endif -if (head ==NULL ) { - head =g_malloc0 (sizeof (*caps)); - caps = head; - }else { - caps->next =g_malloc0 (sizeof (*caps)); - caps = caps->next; - } - caps->value = -g_malloc (sizeof (*caps->value)); - caps->value->capability = i; - caps->value->state = s->enabled_capabilities[i]; + caps =g_malloc0 (sizeof (*caps)); + caps->capability = i; + caps->state = s->enabled_capabilities[i]; +QAPI_LIST_APPEND (tail, caps); }return head;
monitor/hmp-cmds.c +10 -15
@@ -1703,7 +1703,8 @@ void hmp_closefd(Monitor *mon, const QDict *qdict)void hmp_sendkey (Monitor *mon,const QDict *qdict) {const char *keys =qdict_get_str (qdict,"keys" ); -KeyValueList *keylist, *head =NULL , *tmp =NULL ; +KeyValue *v =NULL ; +KeyValueList *head =NULL , **tail = &head;int has_hold_time =qdict_haskey (qdict,"hold-time" );int hold_time =qdict_get_try_int (qdict,"hold-time" ,-1 );Error *err =NULL ;
@@ -1720,16 +1721,7 @@ void hmp_sendkey(Monitor *mon, const QDict *qdict) keyname_len =4 ; } - keylist =g_malloc0 (sizeof (*keylist)); - keylist->value =g_malloc0 (sizeof (*keylist->value)); - -if (!head) { - head = keylist; - } -if (tmp) { - tmp->next = keylist; - } - tmp = keylist; + v =g_malloc0 (sizeof (*v));if (strstart (keys,"0x" ,NULL )) {char *endp;
@@ -1738,16 +1730,18 @@ void hmp_sendkey(Monitor *mon, const QDict *qdict)if (endp != keys + keyname_len) { goto err_out; } - keylist->value->type =KEY_VALUE_KIND_NUMBER ; - keylist->value->u.number.data = value; + v->type =KEY_VALUE_KIND_NUMBER ; + v->u.number.data = value; }else {int idx =index_from_key (keys, keyname_len);if (idx ==Q_KEY_CODE__MAX ) { goto err_out; } - keylist->value->type =KEY_VALUE_KIND_QCODE ; - keylist->value->u.qcode.data = idx; + v->type =KEY_VALUE_KIND_QCODE ; + v->u.qcode.data = idx; } +QAPI_LIST_APPEND (tail, v); + v =NULL ;if (!*separator) {break ;
@@ -1759,6 +1753,7 @@ void hmp_sendkey(Monitor *mon, const QDict *qdict)hmp_handle_error (mon, err); out: +qapi_free_KeyValue (v);qapi_free_KeyValueList (head);return ;
net/net.c +2 -11
@@ -1197,10 +1197,9 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name, Error **errp) {NetClientState *nc; -RxFilterInfoList *filter_list =NULL , *last_entry =NULL ; +RxFilterInfoList *filter_list =NULL , **tail = &filter_list; QTAILQ_FOREACH(nc, &net_clients, next) { -RxFilterInfoList *entry;RxFilterInfo *info;if (has_name &&strcmp (nc->name, name) !=0 ) {
@@ -1225,15 +1224,7 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name,if (nc->info->query_rx_filter) { info = nc->info->query_rx_filter (nc); - entry =g_malloc0 (sizeof (*entry)); - entry->value = info; - -if (!filter_list) { - filter_list = entry; - }else { - last_entry->next = entry; - } - last_entry = entry; +QAPI_LIST_APPEND (tail, info); }else if (has_name) {error_setg (errp,"net client(%s) doesn't support" " rx-filter querying" , name);
qga/commands-posix.c +36 -58
197 lines not on this page · raw message
qga/commands-win32.c +30 -58
164 lines not on this page · raw message
softmmu/tpm.c +6 -32
@@ -196,22 +196,14 @@ int tpm_config_parse(QemuOptsList *opts_list, const char *optarg)TPMInfoList *qmp_query_tpm (Error **errp) {TPMBackend *drv; -TPMInfoList *info, *head =NULL , *cur_item =NULL ; +TPMInfoList *head =NULL , **tail = &head; QLIST_FOREACH(drv, &tpm_backends, list) {if (!drv->tpmif) {continue ; } - info =g_new0 (TPMInfoList,1 ); - info->value =tpm_backend_query_tpm (drv); - -if (!cur_item) { - head = cur_item = info; - }else { - cur_item->next = info; - cur_item = info; - } +QAPI_LIST_APPEND (tail,tpm_backend_query_tpm (drv)); }return head;
@@ -220,44 +212,26 @@ TPMInfoList *qmp_query_tpm(Error **errp)TpmTypeList *qmp_query_tpm_types (Error **errp) {unsigned int i =0 ; -TpmTypeList *head =NULL , *prev =NULL , *cur_item; +TpmTypeList *head =NULL , **tail = &head;for (i =0 ; i <TPM_TYPE__MAX ; i++) {if (!tpm_be_find_by_type (i)) {continue ; } - cur_item =g_new0 (TpmTypeList,1 ); - cur_item->value = i; - -if (prev) { - prev->next = cur_item; - } -if (!head) { - head = cur_item; - } - prev = cur_item; +QAPI_LIST_APPEND (tail, i); }return head; }TpmModelList *qmp_query_tpm_models (Error **errp) { -TpmModelList *head =NULL , *prev =NULL , *cur_item; +TpmModelList *head =NULL , **tail = &head;GSList *e, *l =object_class_get_list (TYPE_TPM_IF , false);for (e = l; e; e = e->next) {TPMIfClass *c =TPM_IF_CLASS (e->data); - cur_item =g_new0 (TpmModelList,1 ); - cur_item->value = c->model; - -if (prev) { - prev->next = cur_item; - } -if (!head) { - head = cur_item; - } - prev = cur_item; +QAPI_LIST_APPEND (tail, c->model); }g_slist_free (l);
ui/spice-core.c +10 -17
@@ -354,11 +354,11 @@ static const char *wan_compression_names[] = {static SpiceChannelList *qmp_query_spice_channels (void ) { -SpiceChannelList *cur_item =NULL , *head =NULL ; +SpiceChannelList *head =NULL , **tail = &head;ChannelList *item; QTAILQ_FOREACH(item, &channel_list, link) { -SpiceChannelList *chan; +SpiceChannel *chan;char host[NI_MAXHOST ], port[NI_MAXSERV ];struct sockaddr *paddr;socklen_t plen;
@@ -366,29 +366,22 @@ static SpiceChannelList *qmp_query_spice_channels(void)assert (item->info->flags &SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT ); chan =g_malloc0 (sizeof (*chan)); - chan->value =g_malloc0 (sizeof (*chan->value)); paddr = (struct sockaddr *)&item->info->paddr_ext; plen = item->info->plen_ext;getnameinfo (paddr, plen, host,sizeof (host), port,sizeof (port),NI_NUMERICHOST |NI_NUMERICSERV ); - chan->value->host =g_strdup (host); - chan->value->port =g_strdup (port); - chan->value->family =inet_netfamily (paddr->sa_family); + chan->host =g_strdup (host); + chan->port =g_strdup (port); + chan->family =inet_netfamily (paddr->sa_family); - chan->value->connection_id = item->info->connection_id; - chan->value->channel_type = item->info->type; - chan->value->channel_id = item->info->id; - chan->value->tls = item->info->flags &SPICE_CHANNEL_EVENT_FLAG_TLS ; + chan->connection_id = item->info->connection_id; + chan->channel_type = item->info->type; + chan->channel_id = item->info->id; + chan->tls = item->info->flags &SPICE_CHANNEL_EVENT_FLAG_TLS ; -/* XXX: waiting for the qapi to support GSList */ -if (!cur_item) { - head = cur_item = chan; - }else { - cur_item->next = chan; - cur_item = chan; - } +QAPI_LIST_APPEND (tail, chan); }return head;
Signature · 1 line
2.30.0
Re: [PATCH v4 5/5] qapi: More complex uses of QAPI_LIST_APPEND
Quoted 5 lines · Eric Blake
These cases require a bit more thought to review; in each case, the code was appending to a list, but not with a FOOList **tail variable.
Signed-off-by Eric Blake <[email protected]>Reviewed-by Vladimir Sementsov-Ogievskiy <[email protected]>
Re: [PATCH v4 5/5] qapi: More complex uses of QAPI_LIST_APPEND
In reply to Eric BlakeQuoted 8 lines · Eric Blake
These cases require a bit more thought to review; in each case, the code was appending to a list, but not with a FOOList **tail variable.
Signed-off-by Eric Blake <[email protected]>Reviewed-by Vladimir Sementsov-Ogievskiy <[email protected]>---
fixqmp_guest_network_get_interfaces[Vladimir]
Fails tests/test-qga. I should've double-checked earlier.
Quoted 1 line
---
[...]
Quoted 164 lines
qga/commands-posix.c +27
-43@@ -2153,17 +2153,17 @@ void qmp_guest_suspend_hybrid(Error **errp)guest_suspend (SUSPEND_MODE_HYBRID , errp); } -static GuestNetworkInterfaceList * +static GuestNetworkInterface *guest_find_interface (GuestNetworkInterfaceList *head,const char *name) {for (; head; head = head->next) {if (strcmp (head->value->name, name) ==0 ) { -break ; +return head->value; } } -return head; +return NULL ; } static int guest_get_network_stats(const char *name,@@ -2232,7 +2232,7 @@ static int guest_get_network_stats(const char *name,*/ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces (Error **errp) { -GuestNetworkInterfaceList *head =NULL , *cur_item =NULL ; +GuestNetworkInterfaceList *head =NULL , **tail = &head;struct ifaddrs *ifap, *ifa;if (getifaddrs (&ifap) <0 ) {@@ -2241,9 +2241,10 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) }for (ifa = ifap; ifa; ifa = ifa->ifa_next) { -GuestNetworkInterfaceList *info; -GuestIpAddressList **address_list =NULL , *address_item =NULL ; -GuestNetworkInterfaceStat *interface_stat =NULL ; +GuestNetworkInterface *info; +GuestIpAddressList **address_tail; +GuestIpAddress *address_item =NULL ; +GuestNetworkInterfaceStat *interface_stat =NULL ;char addr4[INET_ADDRSTRLEN ];char addr6[INET6_ADDRSTRLEN ];int sock;@@ -2257,19 +2258,12 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)if (!info) { info =g_malloc0 (sizeof (*info)); - info->value =g_malloc0 (sizeof (*info->value)); - info->value->name =g_strdup (ifa->ifa_name); + info->name =g_strdup (ifa->ifa_name); -if (!cur_item) { - head = cur_item = info; - }else { - cur_item->next = info; - cur_item = info; - } +QAPI_LIST_APPEND (tail, info); } -if (!info->value->has_hardware_address && - ifa->ifa_flags &SIOCGIFHWADDR ) { +if (!info->has_hardware_address && ifa->ifa_flags &SIOCGIFHWADDR ) {/* we haven't obtained HW address yet */ sock =socket (PF_INET ,SOCK_STREAM ,0 );if (sock ==-1 ) {@@ -2278,7 +2272,7 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) }memset (&ifr,0 ,sizeof (ifr)); -pstrcpy (ifr.ifr_name,IF_NAMESIZE , info->value->name); +pstrcpy (ifr.ifr_name,IF_NAMESIZE , info->name);if (ioctl (sock,SIOCGIFHWADDR , &ifr) ==-1 ) { error_setg_errno(errp, errno, "failed to get MAC address of %s",@@ -2290,13 +2284,13 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)close (sock); mac_addr = (unsigned char *) &ifr.ifr_hwaddr.sa_data; - info->value->hardware_address = + info->hardware_address =g_strdup_printf ("%02x:%02x:%02x:%02x:%02x:%02x" , (int ) mac_addr[0 ], (int ) mac_addr[1 ], (int ) mac_addr[2 ], (int ) mac_addr[3 ], (int ) mac_addr[4 ], (int ) mac_addr[5 ]); - info->value->has_hardware_address = true; + info->has_hardware_address = true; } if (ifa->ifa_addr &&@@ -2309,15 +2303,14 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) } address_item =g_malloc0 (sizeof (*address_item)); - address_item->value =g_malloc0 (sizeof (*address_item->value)); - address_item->value->ip_address =g_strdup (addr4); - address_item->value->ip_address_type =GUEST_IP_ADDRESS_TYPE_IPV4 ; + address_item->ip_address =g_strdup (addr4); + address_item->ip_address_type =GUEST_IP_ADDRESS_TYPE_IPV4 ;if (ifa->ifa_netmask) {/* Count the number of set bits in netmask. * This is safe as '1' and '0' cannot be shuffled in netmask. */ p = &((struct sockaddr_in *)ifa->ifa_netmask)->sin_addr; - address_item->value->prefix =ctpop32 (((uint32_t *) p)[0 ]); + address_item->prefix =ctpop32 (((uint32_t *) p)[0 ]); } }else if (ifa->ifa_addr && ifa->ifa_addr->sa_family ==AF_INET6 ) {@@ -2329,15 +2322,14 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) } address_item =g_malloc0 (sizeof (*address_item)); - address_item->value =g_malloc0 (sizeof (*address_item->value)); - address_item->value->ip_address =g_strdup (addr6); - address_item->value->ip_address_type =GUEST_IP_ADDRESS_TYPE_IPV6 ; + address_item->ip_address =g_strdup (addr6); + address_item->ip_address_type =GUEST_IP_ADDRESS_TYPE_IPV6 ;if (ifa->ifa_netmask) {/* Count the number of set bits in netmask. * This is safe as '1' and '0' cannot be shuffled in netmask. */ p = &((struct sockaddr_in6 *)ifa->ifa_netmask)->sin6_addr; - address_item->value->prefix = + address_item->prefix =ctpop32 (((uint32_t *) p)[0 ]) +ctpop32 (((uint32_t *) p)[1 ]) + ctpop32(((uint32_t *) p)[2]) +@@ -2349,29 +2341,22 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)continue ; } - address_list = &info->value->ip_addresses; - -while (*address_list && (*address_list)->next) { - address_list = &(*address_list)->next; - } - -if (!*address_list) { - *address_list = address_item; - }else { - (*address_list)->next = address_item; + address_tail = &info->ip_addresses; +while (!*address_tail) { + address_tail = &(*address_tail)->next; } +QAPI_LIST_APPEND (address_tail, address_item); - info->value->has_ip_addresses = true; + info->has_ip_addresses = true; -if (!info->value->has_statistics) { +if (!info->has_statistics) { interface_stat =g_malloc0 (sizeof (*interface_stat)); -if (guest_get_network_stats (info->value->name, - interface_stat) ==-1 ) { - info->value->has_statistics = false; +if (guest_get_network_stats (info->name, interface_stat) ==-1 ) {
qga/commands-posix.c GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) · line 2362
Quoted 10 lines
qga/commands-posix.c +3
-2+ info->has_statistics = false;g_free (interface_stat); }else { - info->value->statistics = interface_stat; - info->value->has_statistics = true; + info->statistics = interface_stat; + info->has_statistics = true; } } }
Dropping this part unbreaks the test.
I'd like to drop just this part, and merge the rest. You can then respin just this part as a follow-up patch. Okay?
I can't test qemu-ga under Windows. Fingers crossed...
[...]
Re: [PATCH v4 5/5] qapi: More complex uses of QAPI_LIST_APPEND
Quoted 5 lines · Markus Armbruster
Quoted 3 lines · Eric Blake
These cases require a bit more thought to review; in each case, the code was appending to a list, but not with a FOOList **tail variable.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Eric Blake <[email protected]>Reviewed-by Vladimir Sementsov-Ogievskiy <[email protected]>---
fixqmp_guest_network_get_interfaces[Vladimir]Fails tests/test-qga. I should've double-checked earlier.
I ran 'make check', but I'll check again. In the meantime,
Quoted 5 lines
Dropping this part unbreaks the test.
I'd like to drop just this part, and merge the rest. You can then respin just this part as a follow-up patch. Okay?
this plan is okay with me.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH v4 5/5] qapi: More complex uses of QAPI_LIST_APPEND
Quoted 18 lines · Eric Blake
Quoted 5 lines · Markus Armbruster
Quoted 3 lines · Eric Blake
These cases require a bit more thought to review; in each case, the code was appending to a list, but not with a FOOList **tail variable.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Eric Blake <[email protected]>Reviewed-by Vladimir Sementsov-Ogievskiy <[email protected]>---
fixqmp_guest_network_get_interfaces[Vladimir]Fails tests/test-qga. I should've double-checked earlier.
I ran 'make check', but I'll check again. In the meantime,
Quoted 1 line
Quoted 6 lines
Quoted 4 lines
Dropping this part unbreaks the test.
I'd like to drop just this part, and merge the rest. You can then respin just this part as a follow-up patch. Okay?
this plan is okay with me.
Done. Thanks!
Re: [PATCH v4 5/5] qapi: More complex uses of QAPI_LIST_APPEND
In reply to Markus ArmbrusterQuoted 5 lines · Markus Armbruster
Quoted 3 lines · Eric Blake
These cases require a bit more thought to review; in each case, the code was appending to a list, but not with a FOOList **tail variable.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Eric Blake <[email protected]>Reviewed-by Vladimir Sementsov-Ogievskiy <[email protected]>---
fixqmp_guest_network_get_interfaces[Vladimir]Fails tests/test-qga. I should've double-checked earlier.
And me, too. Looks like the culprit is:
Quoted 16 lines
Quoted 6 lines
qga/commands-posix.c +0
-5- address_list = &info->value->ip_addresses; - -while (*address_list && (*address_list)->next) { - address_list = &(*address_list)->next; - }qga/commands-posix.c GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) · line 2348
Quoted 10 lines
qga/commands-posix.c +4
-5- -if (!*address_list) { - *address_list = address_item; - }else { - (*address_list)->next = address_item; + address_tail = &info->ip_addresses; +while (!*address_tail) { + address_tail = &(*address_tail)->next; } +QAPI_LIST_APPEND (address_tail, address_item);
right here; the condition 'while (!*address_tail)' should instead be 'while (*address_tail)'. Will submit v5 now that I've identified the bug.
Quoted 7 lines
I'd like to drop just this part, and merge the rest. You can then respin just this part as a follow-up patch. Okay?
I can't test qemu-ga under Windows. Fingers crossed...
[...]
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Quoted 5 lines · Eric Blake
v3 was here:
https://lists.gnu.org/archive/html/qemu-devel/2020-12/msg06009.htmlSince then: rebase to the patches that were already applied [Markus], address review comments [Markus, Vladimir]
Queued. I can still squash in the commit message tweak Vladimir suggested for PATCH 1. You tell me.
Thanks!