Commit 1454d33f authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Paolo Bonzini
Browse files

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: default avatarXiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent aa5cb7f5

backends/hostmem.c

+14 −8
Original line number Diff line number Diff line
@@ -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);

}