Commit c595b218 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into staging 



NUMA queue, 2015-12-18

# gpg: Signature made Fri 18 Dec 2015 17:53:48 GMT using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"

* remotes/ehabkost/tags/numa-pull-request:
  numa: Clean up query-memdev error handling

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c6880845 2f6f826e

numa.c

+10 −49
Original line number Diff line number Diff line
@@ -517,7 +517,6 @@ static int query_memdev(Object *obj, void *opaque) 
{

    MemdevList **list = opaque;

    MemdevList *m = NULL;

    Error *err = NULL;



    if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND)) {

        m = g_malloc0(sizeof(*m));
@@ -525,72 +524,34 @@ static int query_memdev(Object *obj, void *opaque) 
        m->value = g_malloc0(sizeof(*m->value));



        m->value->size = object_property_get_int(obj, "size",

                                                 &err);

        if (err) {

            goto error;

        }



                                                 &error_abort);

        m->value->merge = object_property_get_bool(obj, "merge",

                                                   &err);

        if (err) {

            goto error;

        }



                                                   &error_abort);

        m->value->dump = object_property_get_bool(obj, "dump",

                                                  &err);

        if (err) {

            goto error;

        }



                                                  &error_abort);

        m->value->prealloc = object_property_get_bool(obj,

                                                      "prealloc", &err);

        if (err) {

            goto error;

        }



                                                      "prealloc",

                                                      &error_abort);

        m->value->policy = object_property_get_enum(obj,

                                                    "policy",

                                                    "HostMemPolicy",

                                                    &err);

        if (err) {

            goto error;

        }



                                                    &error_abort);

        object_property_get_uint16List(obj, "host-nodes",

                                       &m->value->host_nodes, &err);

        if (err) {

            goto error;

        }

                                       &m->value->host_nodes,

                                       &error_abort);



        m->next = *list;

        *list = m;

    }



    return 0;

error:

    g_free(m->value);

    g_free(m);



    return -1;

}



MemdevList *qmp_query_memdev(Error **errp)

{

    Object *obj;

    Object *obj = object_get_objects_root();

    MemdevList *list = NULL;



    obj = object_get_objects_root();

    if (obj == NULL) {

        return NULL;

    }



    if (object_child_foreach(obj, query_memdev, &list) != 0) {

        goto error;

    }



    object_child_foreach(obj, query_memdev, &list);

    return list;



error:

    qapi_free_MemdevList(list);

    return NULL;

}