numa: Clean up query-memdev error handling
PATCH v2 1/1 numa: Clean up query-memdev error handling
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".
--- numa.c | 59 ++++++++++------------------------------------------------- 1 file changed, 10 insertions(+), 49 deletions(-)
numa.c +10 -49
@@ -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 ; }
Signature · 1 line
2.4.3
Quoted 5 lines · Markus Armbruster
qmp_query_memdev()has two error paths:* When
object_get_objects_root()returns null. It never does, so simply drop the useless error handling.
Quoted 7 lines
* 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 <[email protected]>
Post 2.5 right?
Quoted 101 lines
--- numa.c | 59 ++++++++++------------------------------------------------- 1 file changed, 10 insertions(+), 49 deletions(-)numa.c +10
-49@@ -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 ; }Signature · 1 line
2.4.3
Quoted 10 lines · Michael S. Tsirkin
Quoted 9 lines · Markus Armbruster
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.
Quoted 6 lines
Quoted 3 lines
Messed up in commit 76b5d85 "qmp: add query-memdev".
Signed-off-by Markus Armbruster <[email protected]>Post 2.5 right?
I don't mind. I meant v1 for 2.5, but we've since convinced ourselves that errors can't happen, and the memory leak is only latent.
Quoted 14 lines · Markus Armbruster
Quoted 12 lines · Michael S. Tsirkin
Quoted 11 lines · Markus Armbruster
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".
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Markus Armbruster <[email protected]>Post 2.5 right?
I don't mind. I meant v1 for 2.5, but we've since convinced ourselves that errors can't happen, and the memory leak is only latent.
Friendly ping for 2.6.
Quoted 5 lines · Markus Armbruster
qmp_query_memdev()has two error paths:* When
object_get_objects_root()returns null. It never does, so simply drop the useless error handling.
Quoted 7 lines
* 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 <[email protected]>
Applied to the numa tree. Thanks!
Signature · 1 line
Eduardo