From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCVOZ-00016I-E9 for qemu-devel@nongnu.org; Tue, 27 Mar 2012 08:21:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCVOS-0000K8-Hy for qemu-devel@nongnu.org; Tue, 27 Mar 2012 08:21:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49230) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCVOS-0000Jt-9z for qemu-devel@nongnu.org; Tue, 27 Mar 2012 08:20:56 -0400 From: Luiz Capitulino Date: Tue, 27 Mar 2012 09:20:44 -0300 Message-Id: <1332850851-4059-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1332850851-4059-1-git-send-email-lcapitulino@redhat.com> References: <1332850851-4059-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 06/13] qapi: shortcut visits on errors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: Paolo Bonzini , qemu-devel@nongnu.org From: Paolo Bonzini We can exit very soon if we enter a visitor with a preexisting error. This simplifies some cases because we will not have to deal with obj being non-NULL while *obj is NULL. Signed-off-by: Paolo Bonzini Reviewed-by: Anthony Liguori Signed-off-by: Luiz Capitulino --- scripts/qapi-visit.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 78c947c..4297621 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -61,6 +61,9 @@ def generate_visit_struct(name, members): void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error **errp) { + if (error_is_set(errp)) { + return; + } visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(name)s), errp); ''', name=name) @@ -81,6 +84,9 @@ void visit_type_%(name)sList(Visitor *m, %(name)sList ** obj, const char *name, { GenericList *i, **head = (GenericList **)obj; + if (error_is_set(errp)) { + return; + } visit_start_list(m, name, errp); for (*head = i = visit_next_list(m, head, errp); i; i = visit_next_list(m, &i, errp)) { @@ -112,6 +118,9 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error ** { Error *err = NULL; + if (error_is_set(errp)) { + return; + } visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(name)s), &err); visit_type_%(name)sKind(m, &(*obj)->kind, "type", &err); if (err) { -- 1.7.9.2.384.g4a92a