From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42036) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAgYH-0002nj-0N for qemu-devel@nongnu.org; Thu, 22 Mar 2012 07:51:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SAgYA-0004k0-N8 for qemu-devel@nongnu.org; Thu, 22 Mar 2012 07:51:32 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:56196) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAgYA-0004jE-EM for qemu-devel@nongnu.org; Thu, 22 Mar 2012 07:51:26 -0400 Received: by wibhr17 with SMTP id hr17so547967wib.10 for ; Thu, 22 Mar 2012 04:51:24 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 22 Mar 2012 12:51:06 +0100 Message-Id: <1332417072-20329-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1332417072-20329-1-git-send-email-pbonzini@redhat.com> References: <1332417072-20329-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 04/10] qapi: shortcut visits on errors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, eblake@redhat.com, anthony@codemonkey.vs, lcapitulino@redhat.com 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 --- scripts/qapi-visit.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 54117d4..b242315 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.1