* [Qemu-devel] [PULL 0/1] NUMA queue, 2015-12-18
@ 2015-12-18 17:54 Eduardo Habkost
2015-12-18 17:54 ` [Qemu-devel] [PULL 1/1] numa: Clean up query-memdev error handling Eduardo Habkost
2015-12-22 14:21 ` [Qemu-devel] [PULL 0/1] NUMA queue, 2015-12-18 Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Eduardo Habkost @ 2015-12-18 17:54 UTC (permalink / raw)
To: Peter Maydell; +Cc: Paolo Bonzini, qemu-devel
The following changes since commit c688084506cf2cf2eba4ba9df4e91abb6e3dab83:
Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-secrets-base-2015-12-18-1' into staging (2015-12-18 17:04:15 +0000)
are available in the git repository at:
git://github.com/ehabkost/qemu.git tags/numa-pull-request
for you to fetch changes up to 2f6f826e03e09eb3b65b3a764580d66b857e3a23:
numa: Clean up query-memdev error handling (2015-12-18 15:50:24 -0200)
----------------------------------------------------------------
NUMA queue, 2015-12-18
----------------------------------------------------------------
Markus Armbruster (1):
numa: Clean up query-memdev error handling
numa.c | 59 ++++++++++-------------------------------------------------
1 file changed, 10 insertions(+), 49 deletions(-)
--
2.1.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Qemu-devel] [PULL 1/1] numa: Clean up query-memdev error handling
2015-12-18 17:54 [Qemu-devel] [PULL 0/1] NUMA queue, 2015-12-18 Eduardo Habkost
@ 2015-12-18 17:54 ` Eduardo Habkost
2015-12-22 14:21 ` [Qemu-devel] [PULL 0/1] NUMA queue, 2015-12-18 Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Eduardo Habkost @ 2015-12-18 17:54 UTC (permalink / raw)
To: Peter Maydell; +Cc: Paolo Bonzini, qemu-devel, Markus Armbruster
From: Markus Armbruster <armbru@redhat.com>
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>
---
numa.c | 59 ++++++++++-------------------------------------------------
1 file changed, 10 insertions(+), 49 deletions(-)
diff --git a/numa.c b/numa.c
index fdfe294..1710946 100644
--- a/numa.c
+++ b/numa.c
@@ -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;
}
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PULL 0/1] NUMA queue, 2015-12-18
2015-12-18 17:54 [Qemu-devel] [PULL 0/1] NUMA queue, 2015-12-18 Eduardo Habkost
2015-12-18 17:54 ` [Qemu-devel] [PULL 1/1] numa: Clean up query-memdev error handling Eduardo Habkost
@ 2015-12-22 14:21 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2015-12-22 14:21 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: Paolo Bonzini, QEMU Developers
On 18 December 2015 at 17:54, Eduardo Habkost <ehabkost@redhat.com> wrote:
> The following changes since commit c688084506cf2cf2eba4ba9df4e91abb6e3dab83:
>
> Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-secrets-base-2015-12-18-1' into staging (2015-12-18 17:04:15 +0000)
>
> are available in the git repository at:
>
> git://github.com/ehabkost/qemu.git tags/numa-pull-request
>
> for you to fetch changes up to 2f6f826e03e09eb3b65b3a764580d66b857e3a23:
>
> numa: Clean up query-memdev error handling (2015-12-18 15:50:24 -0200)
>
> ----------------------------------------------------------------
> NUMA queue, 2015-12-18
>
> ----------------------------------------------------------------
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-12-22 14:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-18 17:54 [Qemu-devel] [PULL 0/1] NUMA queue, 2015-12-18 Eduardo Habkost
2015-12-18 17:54 ` [Qemu-devel] [PULL 1/1] numa: Clean up query-memdev error handling Eduardo Habkost
2015-12-22 14:21 ` [Qemu-devel] [PULL 0/1] NUMA queue, 2015-12-18 Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.