diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-06 18:52:19 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-06 18:52:19 +0000 |
| commit | 32694e98b8d7a246345448a8f707d2e11d6c65e2 (patch) | |
| tree | 0e06e487e44277ebca74e231ada5d6665920c2e2 /backends | |
| parent | c557a8c7b755d8c153fc0f5be00688228be96e76 (diff) | |
| parent | 14405c274e86e993e90198a49eecab3ca0ded8db (diff) | |
| download | qemu-32694e98b8d7a246345448a8f707d2e11d6c65e2.zip qemu-32694e98b8d7a246345448a8f707d2e11d6c65e2.tar.gz qemu-32694e98b8d7a246345448a8f707d2e11d6c65e2.tar.bz2 | |
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging
Machine queue, 2019-03-06
* qdev: Hotplug handler chaining (David Hildenbrand)
* qdev: fix qbus_is_full() (Tony Krowiak)
* hostmem: fix crash when querying empty host-nodes property via
QMP (Igor Mammedov)
# gpg: Signature made Wed 06 Mar 2019 18:39:29 GMT
# gpg: using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/machine-next-pull-request:
qdev: Provide qdev_get_bus_hotplug_handler()
qdev: Let machine hotplug handler to override bus hotplug handler
qdev: Let the hotplug_handler_unplug() caller delete the device
hostmem: fix crash when querying empty host-nodes property via QMP
qdev/core: fix qbus_is_full()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/hostmem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/backends/hostmem.c b/backends/hostmem.c index 87b19d2..04baf47 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -88,7 +88,7 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name, value = find_first_bit(backend->host_nodes, MAX_NODES); if (value == MAX_NODES) { - return; + goto ret; } *node = g_malloc0(sizeof(**node)); @@ -106,6 +106,7 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name, node = &(*node)->next; } while (true); +ret: visit_type_uint16List(v, name, &host_nodes, errp); } |