From patchwork Mon Apr 6 23:25:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 458534 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 4A187140218 for ; Tue, 7 Apr 2015 09:26:35 +1000 (AEST) Received: from localhost ([::1]:42148 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfGPZ-0003G8-CA for incoming@patchwork.ozlabs.org; Mon, 06 Apr 2015 19:26:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfGPJ-0002hs-0U for qemu-devel@nongnu.org; Mon, 06 Apr 2015 19:26:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfGPF-0000WI-Jo for qemu-devel@nongnu.org; Mon, 06 Apr 2015 19:26:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38231) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfGPF-0000WA-C2 for qemu-devel@nongnu.org; Mon, 06 Apr 2015 19:26:13 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t36NPTnU027715 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 6 Apr 2015 19:25:29 -0400 Received: from [10.3.113.98] (ovpn-113-98.phx2.redhat.com [10.3.113.98]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t36NPSTZ014672; Mon, 6 Apr 2015 19:25:28 -0400 Message-ID: <552315E7.3050308@redhat.com> Date: Mon, 06 Apr 2015 17:25:27 -0600 From: Eric Blake Organization: Red Hat, Inc. User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Markus Armbruster , qemu-devel@nongnu.org References: <1427995743-7865-1-git-send-email-armbru@redhat.com> <1427995743-7865-3-git-send-email-armbru@redhat.com> In-Reply-To: <1427995743-7865-3-git-send-email-armbru@redhat.com> OpenPGP: url=http://people.redhat.com/eblake/eblake.gpg X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, akong@redhat.com, berto@igalia.com, mdroth@linux.vnet.ibm.com Subject: Re: [Qemu-devel] [PATCH RFC 02/19] qapi: Fix C identifiers generated for names containing '.' 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 On 04/02/2015 11:28 AM, Markus Armbruster wrote: > c_fun() maps '.' to '_', c_var() doesn't. Nothing prevents '.' in > QAPI names that get passed to c_var(). > > Which QAPI names get passed to c_fun(), to c_var(), or to both is not > obvious. Names of command parameters and struct type members get > passed to c_var(). > > c_var() strips a leading '*', but this cannot happen. c_fun() > doesn't. > > Fix c_var() to work exactly like c_fun(). > > Perhaps they should be replaced by a single mapping function. > > Signed-off-by: Markus Armbruster > --- > scripts/qapi.py | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) In order to test if we caught everything, I tried adding: [{'enum_name': 'EnumOne', 'enum_values': ['value1', 'value2', 'value3']}, + {'enum_name': '__org.qemu_Enum', 'enum_values': ['__org.qemu_value']}, {'enum_name': 'UserDefAlternateKind', 'enum_values': None}, - {'enum_name': 'UserDefNativeListUnionKind', 'enum_values': None}] + {'enum_name': 'UserDefNativeListUnionKind', 'enum_values': None}, + {'enum_name': '__org.qemu_UnionKind', 'enum_values': None}] [OrderedDict([('struct', 'NestedEnumsOne'), ('data', OrderedDict([('enum1', 'EnumOne'), ('*enum2', 'EnumOne'), ('enum3', 'EnumOne'), ('*enum4', 'EnumOne')]))]), OrderedDict([('struct', 'UserDefZero'), ('data', OrderedDict([('integer', 'int')]))]), OrderedDict([('struct', 'UserDefOne'), ('base', 'UserDefZero'), ('data', OrderedDict([('string', 'str'), ('*enum1', 'EnumOne')]))]), @@ -37,4 +44,5 @@ OrderedDict([('struct', 'UserDefC'), ('data', OrderedDict([('string1', 'str'), ('string2', 'str')]))]), OrderedDict([('struct', 'UserDefUnionBase'), ('data', OrderedDict([('string', 'str'), ('enum1', 'EnumOne')]))]), OrderedDict([('struct', 'UserDefOptions'), ('data', OrderedDict([('*i64', ['int']), ('*u64', ['uint64']), ('*u16', ['uint16']), ('*i64x', 'int'), ('*u64x', 'uint64')]))]), - OrderedDict([('struct', 'EventStructOne'), ('data', OrderedDict([('struct1', 'UserDefOne'), ('string', 'str'), ('*enum2', 'EnumOne')]))])] + OrderedDict([('struct', 'EventStructOne'), ('data', OrderedDict([('struct1', 'UserDefOne'), ('string', 'str'), ('*enum2', 'EnumOne')]))]), + OrderedDict([('struct', '__org.qemu_Struct'), ('data', OrderedDict([('__org.qemu_member', 'str')]))])] but that leads to a number of compilation errors, even with your patch installed, starting with: In file included from tests/test-qmp-output-visitor.c:17:0: tests/test-qapi-types.h:388:21: error: expected identifier or ‘(’ before ‘.’ token typedef struct __org.qemu_Struct __org.qemu_Struct; I'm still playing with it to see if I can find ALL of the culprit spots. diff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qapi-schema-test.json index 8193dc1..757250a 100644 --- a/tests/qapi-schema/qapi-schema-test.json +++ b/tests/qapi-schema/qapi-schema-test.json @@ -107,3 +107,11 @@ 'data': { '*a': 'int', '*b': 'UserDefOne', 'c': 'str' } } { 'event': 'EVENT_D', 'data': { 'a' : 'EventStructOne', 'b' : 'str', '*c': 'str', '*enum3': 'EnumOne' } } + +# test that we correctly compile downstream extensions +{ 'struct': '__org.qemu_Struct', 'data': { '__org.qemu_member': 'str' } } +{ 'enum': '__org.qemu_Enum', 'data': [ '__org.qemu_value' ] } +{ 'event': '__ORG.QEMU_EVENT', 'data': '__org.qemu_Struct' } +{ 'command': '__org.qemu_command', + 'data': { 'a': '__org.qemu_Enum', 'b': '__org.qemu_Struct' } } +{ 'union': '__org.qemu_Union', 'data': { '__org.qemu_branch': 'str' } } diff --git a/tests/qapi-schema/qapi-schema-test.out b/tests/qapi-schema/qapi-schema-test.out index 93c4963..2ba7730 100644 --- a/tests/qapi-schema/qapi-schema-test.out +++ b/tests/qapi-schema/qapi-schema-test.out @@ -22,10 +22,17 @@ OrderedDict([('event', 'EVENT_A')]), OrderedDict([('event', 'EVENT_B'), ('data', OrderedDict())]), OrderedDict([('event', 'EVENT_C'), ('data', OrderedDict([('*a', 'int'), ('*b', 'UserDefOne'), ('c', 'str')]))]), - OrderedDict([('event', 'EVENT_D'), ('data', OrderedDict([('a', 'EventStructOne'), ('b', 'str'), ('*c', 'str'), ('*enum3', 'EnumOne')]))])] + OrderedDict([('event', 'EVENT_D'), ('data', OrderedDict([('a', 'EventStructOne'), ('b', 'str'), ('*c', 'str'), ('*enum3', 'EnumOne')]))]), + OrderedDict([('struct', '__org.qemu_Struct'), ('data', OrderedDict([('__org.qemu_member', 'str')]))]), + OrderedDict([('enum', '__org.qemu_Enum'), ('data', ['__org.qemu_value'])]), + OrderedDict([('event', '__ORG.QEMU_EVENT'), ('data', '__org.qemu_Struct')]), + OrderedDict([('command', '__org.qemu_command'), ('data', OrderedDict([('a', '__org.qemu_Enum'), ('b', '__org.qemu_Struct')]))]), + OrderedDict([('union', '__org.qemu_Union'), ('data', OrderedDict([('__org.qemu_branch', 'str')]))])]