[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/14] qom: catch errors in object_property_add_child
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 05/14] qom: catch errors in object_property_add_child |
Date: |
Mon, 6 Jan 2014 17:03:06 -0500 |
From: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
qom/object.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index fc19cf6..4dee02b 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -988,17 +988,22 @@ static void object_finalize_child_property(Object *obj,
const char *name,
void object_property_add_child(Object *obj, const char *name,
Object *child, Error **errp)
{
+ Error *local_err = NULL;
gchar *type;
type = g_strdup_printf("child<%s>", object_get_typename(OBJECT(child)));
- object_property_add(obj, name, type, object_get_child_property,
- NULL, object_finalize_child_property, child, errp);
-
+ object_property_add(obj, name, type, object_get_child_property, NULL,
+ object_finalize_child_property, child, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ goto out;
+ }
object_ref(child);
g_assert(child->parent == NULL);
child->parent = obj;
+out:
g_free(type);
}
--
1.8.1.4
- [Qemu-devel] [PULL 00/14] QMP queue, Luiz Capitulino, 2014/01/06
- [Qemu-devel] [PULL 01/14] vl: add missing transition debug->finish_migrate, Luiz Capitulino, 2014/01/06
- [Qemu-devel] [PULL 02/14] qemu-monitor: HMP cpu-add wrapper, Luiz Capitulino, 2014/01/06
- [Qemu-devel] [PULL 03/14] rng: initialize file descriptor to -1, Luiz Capitulino, 2014/01/06
- [Qemu-devel] [PULL 08/14] error: Add error_abort, Luiz Capitulino, 2014/01/06
- [Qemu-devel] [PULL 05/14] qom: catch errors in object_property_add_child,
Luiz Capitulino <=
- [Qemu-devel] [PULL 09/14] qdev: Delete dead code, Luiz Capitulino, 2014/01/06
- [Qemu-devel] [PULL 06/14] monitor: add object-del (QMP) and object_del (HMP) command, Luiz Capitulino, 2014/01/06
- [Qemu-devel] [PULL 04/14] qom: fix leak for objects created with -object, Luiz Capitulino, 2014/01/06
- [Qemu-devel] [PULL 12/14] qemu-option: Remove qemu_opts_create_nofail, Luiz Capitulino, 2014/01/06
- [Qemu-devel] [PULL 10/14] hw: Remove assert_no_error usages, Luiz Capitulino, 2014/01/06
- [Qemu-devel] [PULL 11/14] target-i386: Remove assert_no_error usage, Luiz Capitulino, 2014/01/06
- [Qemu-devel] [PULL 07/14] monitor: add object-add (QMP) and object_add (HMP) command, Luiz Capitulino, 2014/01/06
- [Qemu-devel] [PULL 13/14] qerror: Remove assert_no_error(), Luiz Capitulino, 2014/01/06
- [Qemu-devel] [PULL 14/14] migration: qmp_migrate(): keep working after syntax error, Luiz Capitulino, 2014/01/06
- Re: [Qemu-devel] [PULL 00/14] QMP queue, Peter Maydell, 2014/01/06