From patchwork Mon May 4 15:05:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 467677 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6B9FE140157 for ; Tue, 5 May 2015 01:22:01 +1000 (AEST) Received: from localhost ([::1]:34696 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpIBy-0005gA-RG for incoming@patchwork.ozlabs.org; Mon, 04 May 2015 11:21:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpHwe-0005cP-L5 for qemu-devel@nongnu.org; Mon, 04 May 2015 11:06:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YpHwa-0000QT-CU for qemu-devel@nongnu.org; Mon, 04 May 2015 11:06:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34350) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpHwa-0000Q8-4G for qemu-devel@nongnu.org; Mon, 04 May 2015 11:06:04 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t44F61TQ018343 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 4 May 2015 11:06:02 -0400 Received: from red.redhat.com (ovpn-113-25.phx2.redhat.com [10.3.113.25]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t44F5dIw018431; Mon, 4 May 2015 11:06:01 -0400 From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 4 May 2015 09:05:34 -0600 Message-Id: <1430751937-17523-38-git-send-email-eblake@redhat.com> In-Reply-To: <1430751937-17523-1-git-send-email-eblake@redhat.com> References: <1430751937-17523-1-git-send-email-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, berto@igalia.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH v8 37/40] qapi: Drop dead visitor code related to nested structs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Now that we no longer have nested structs to visit, the use of prefix strings is no longer required. Remove the code that is no longer reachable. Signed-off-by: Eric Blake Reviewed-by: Markus Armbruster --- v8: New patch --- scripts/qapi-visit.py | 49 ++++++++++++------------------------------------- 1 file changed, 12 insertions(+), 37 deletions(-) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 6156162..0e67b33 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -43,50 +43,43 @@ static void visit_type_implicit_%(c_type)s(Visitor *m, %(c_type)s **obj, Error * ''', c_type=type_name(type)) -def generate_visit_struct_fields(name, field_prefix, fn_prefix, members, base = None): +def generate_visit_struct_fields(name, members, base = None): substructs = [] ret = '' - if not fn_prefix: - full_name = name - else: - full_name = "%s_%s" % (name, fn_prefix) if base: ret += generate_visit_implicit_struct(base) ret += mcgen(''' -static void visit_type_%(full_name)s_fields(Visitor *m, %(name)s **obj, Error **errp) +static void visit_type_%(name)s_fields(Visitor *m, %(name)s **obj, Error **errp) { Error *err = NULL; ''', - name=name, full_name=full_name) + name=name) push_indent() if base: ret += mcgen(''' -visit_type_implicit_%(type)s(m, &(*obj)->%(c_prefix)s%(c_name)s, &err); +visit_type_implicit_%(type)s(m, &(*obj)->%(c_name)s, &err); if (err) { goto out; } ''', - c_prefix=c_var(field_prefix), type=type_name(base), c_name=c_var('base')) for argname, argentry, optional in parse_args(members): if optional: ret += mcgen(''' -visit_optional(m, &(*obj)->%(c_prefix)shas_%(c_name)s, "%(name)s", &err); -if (!err && (*obj)->%(prefix)shas_%(c_name)s) { +visit_optional(m, &(*obj)->has_%(c_name)s, "%(name)s", &err); +if (!err && (*obj)->has_%(c_name)s) { ''', - c_prefix=c_var(field_prefix), prefix=field_prefix, c_name=c_var(argname), name=argname) push_indent() ret += mcgen(''' -visit_type_%(type)s(m, &(*obj)->%(c_prefix)s%(c_name)s, "%(name)s", &err); +visit_type_%(type)s(m, &(*obj)->%(c_name)s, "%(name)s", &err); ''', - c_prefix=c_var(field_prefix), prefix=field_prefix, type=type_name(argentry), c_name=c_var(argname), name=argname) @@ -114,29 +107,11 @@ out: return ret -def generate_visit_struct_body(field_prefix, name, members): +def generate_visit_struct_body(name, members): ret = mcgen(''' Error *err = NULL; -''') - - if not field_prefix: - full_name = name - else: - full_name = "%s_%s" % (field_prefix, name) - - if len(field_prefix): - ret += mcgen(''' - visit_start_struct(m, NULL, "", "%(name)s", 0, &err); -''', - name=name) - else: - ret += mcgen(''' visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(name)s), &err); -''', - name=name) - - ret += mcgen(''' if (!err) { if (*obj) { visit_type_%(name)s_fields(m, obj, errp); @@ -145,7 +120,7 @@ def generate_visit_struct_body(field_prefix, name, members): } error_propagate(errp, err); ''', - name=full_name) + name=name) return ret @@ -155,7 +130,7 @@ def generate_visit_struct(expr): members = expr['data'] base = expr.get('base') - ret = generate_visit_struct_fields(name, "", "", members, base) + ret = generate_visit_struct_fields(name, members, base) ret += mcgen(''' @@ -164,7 +139,7 @@ void visit_type_%(name)s(Visitor *m, %(name)s **obj, const char *name, Error **e ''', name=name) - ret += generate_visit_struct_body("", name, members) + ret += generate_visit_struct_body(name, members) ret += mcgen(''' } @@ -288,7 +263,7 @@ def generate_visit_union(expr): assert discriminator base_fields = find_struct(base)['data'].copy() del base_fields[discriminator] - ret += generate_visit_struct_fields(name, "", "", base_fields) + ret += generate_visit_struct_fields(name, base_fields) if discriminator: for key in members: