From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqimB-0004Nm-Sr for qemu-devel@nongnu.org; Wed, 11 Dec 2013 07:20:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vqim3-0007S4-FQ for qemu-devel@nongnu.org; Wed, 11 Dec 2013 07:20:27 -0500 Received: from mail-qe0-x22e.google.com ([2607:f8b0:400d:c02::22e]:55010) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vqim3-0007Ru-8H for qemu-devel@nongnu.org; Wed, 11 Dec 2013 07:20:19 -0500 Received: by mail-qe0-f46.google.com with SMTP id a11so5103625qen.19 for ; Wed, 11 Dec 2013 04:20:18 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 11 Dec 2013 13:19:17 +0100 Message-Id: <1386764361-15260-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1386764361-15260-1-git-send-email-pbonzini@redhat.com> References: <1386764361-15260-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [RFC PATCH 10/14] qom: catch errors in object_property_add_child List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, gaowanlong@cn.fujitsu.com, stefanha@redhat.com Signed-off-by: Paolo Bonzini --- qom/object.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/qom/object.c b/qom/object.c index fc19cf6..68fe07a 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); - + NULL, object_finalize_child_property, child, &local_err); + if (error_is_set(&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.4.2