diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-01-28 22:43:18 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-01-28 22:43:18 +0000 |
| commit | 7e7eb9f852a46b51a71ae9d82590b2e4d28827ee (patch) | |
| tree | d63017ecda357d29659abe087aa6a09d808b06b5 /hw/mem/memory-device.c | |
| parent | 0bcd12fb1513bad44f05f2d3a8eef2a99b3077b6 (diff) | |
| parent | 95b3a8c8a82a34ca874ac0d4a9bbbdb38034acf3 (diff) | |
| download | qemu-7e7eb9f852a46b51a71ae9d82590b2e4d28827ee.zip qemu-7e7eb9f852a46b51a71ae9d82590b2e4d28827ee.tar.gz qemu-7e7eb9f852a46b51a71ae9d82590b2e4d28827ee.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-01-28' into staging
QAPI patches patches for 2021-01-28
# gpg: Signature made Thu 28 Jan 2021 07:10:21 GMT
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2021-01-28:
qapi: More complex uses of QAPI_LIST_APPEND
qapi: Use QAPI_LIST_APPEND in trivial cases
qapi: Introduce QAPI_LIST_APPEND
qapi: A couple more QAPI_LIST_PREPEND() stragglers
net: Clarify early exit condition
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/mem/memory-device.c')
| -rw-r--r-- | hw/mem/memory-device.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index cf0627f..d9f8301 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -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); |