From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a69NC-0004J8-NU for qemu-devel@nongnu.org; Mon, 07 Dec 2015 22:55:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a69NB-0003X1-GH for qemu-devel@nongnu.org; Mon, 07 Dec 2015 22:55:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46683) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a69NB-0003Wk-7i for qemu-devel@nongnu.org; Mon, 07 Dec 2015 22:55:29 -0500 From: Eric Blake Date: Mon, 7 Dec 2015 20:54:58 -0700 Message-Id: <1449546921-6378-9-git-send-email-eblake@redhat.com> In-Reply-To: <1449546921-6378-1-git-send-email-eblake@redhat.com> References: <1449546921-6378-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v7 08/31] qapi: Track all failures between visit_start/stop List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, Michael Roth Inside the generated code between visit_start_struct() and visit_end_struct(), we were blindly setting the error into the caller's errp parameter. But a future patch to split visit_end_struct() will require that we take action based on whether an error has occurred, which requires us to track all actions through a local err. Rewrite the visits to be more in line with the other generated calls. Signed-off-by: Eric Blake --- v7: place earlier in series v6: based loosely on v5 7/46, but mostly a rewrite to get the last generated code in the same form as all the others, so that the later conversion to split visit_check_struct() will be easier --- scripts/qapi-visit.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index b93690b..4a4f67d 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -123,12 +123,18 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error Error *err = NULL; visit_start_struct(v, (void **)obj, "%(name)s", name, sizeof(%(c_name)s), &err); - if (!err) { - if (*obj) { - visit_type_%(c_name)s_fields(v, obj, errp); - } - visit_end_struct(v, &err); + if (err) { + goto out; } + if (!*obj) { + goto out_obj; + } + visit_type_%(c_name)s_fields(v, obj, &err); +out_obj: + error_propagate(errp, err); + err = NULL; + visit_end_struct(v, &err); +out: error_propagate(errp, err); } ''', -- 2.4.3