diff options
author | Xiao Guangrong <guangrong.xiao@linux.intel.com> | 2016-07-13 12:18:05 +0800 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-07-13 13:30:04 +0200 |
commit | 1454d33f0507cb54d62ed80f494884157c9e7130 (patch) | |
tree | 92d9d3c6bc0b64f46af8ac68124c1b8aa7366448 | |
parent | aa5cb7f5e8bf2e6737d0cb36c118332ca26e7797 (diff) |
hostmem: fix QEMU crash by 'info memdev'
'info memdev' crashes QEMU:
(qemu) info memdev
Unexpected error in parse_str() at qapi/string-input-visitor.c:111:
Parameter 'null' expects an int64 value or range
It is caused by null uint16List is returned if 'host-nodes' is the default
value
Return MAX_NODES under this case to fix this bug
Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | backends/hostmem.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/backends/hostmem.c b/backends/hostmem.c index 6e28be11eb..8dede4db2e 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -64,6 +64,14 @@ out: error_propagate(errp, local_err); } +static uint16List **host_memory_append_node(uint16List **node, + unsigned long value) +{ + *node = g_malloc0(sizeof(**node)); + (*node)->value = value; + return &(*node)->next; +} + static void host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) @@ -74,25 +82,23 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name, unsigned long value; value = find_first_bit(backend->host_nodes, MAX_NODES); + + node = host_memory_append_node(node, value); + if (value == MAX_NODES) { - return; + goto out; } - *node = g_malloc0(sizeof(**node)); - (*node)->value = value; - node = &(*node)->next; - do { value = find_next_bit(backend->host_nodes, MAX_NODES, value + 1); if (value == MAX_NODES) { break; } - *node = g_malloc0(sizeof(**node)); - (*node)->value = value; - node = &(*node)->next; + node = host_memory_append_node(node, value); } while (true); +out: visit_type_uint16List(v, name, &host_nodes, errp); } |