mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

numa: Clean up query-memdev error handling

Browse Source 
qmp_query_memdev() has two error paths:

* When object_get_objects_root() returns null.  It never does, so
  simply drop the useless error handling.

* When query_memdev() fails.  It leaks err then.  But any failure
  there is actually a programming error.  Switch it to &error_abort,
  and drop the useless error handling.

Messed up in commit 76b5d85 "qmp: add query-memdev".

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Markus Armbruster 2015-11-23 09:35:31 +01:00 committed by Eduardo Habkost
parent c688084506
commit 2f6f826e03
1 changed files with 10 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
numa.c
View File

@ -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;
}