From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1N9K-0000WJ-ET for qemu-devel@nongnu.org; Mon, 22 Jul 2013 16:56:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1N9G-0005FX-56 for qemu-devel@nongnu.org; Mon, 22 Jul 2013 16:56:06 -0400 Received: from mail-ie0-x22b.google.com ([2607:f8b0:4001:c03::22b]:64420) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1N9G-0005FR-0s for qemu-devel@nongnu.org; Mon, 22 Jul 2013 16:56:02 -0400 Received: by mail-ie0-f171.google.com with SMTP id 10so1573354ied.2 for ; Mon, 22 Jul 2013 13:56:01 -0700 (PDT) Sender: fluxion Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <20130715162033.16676.48300.stgit@outback> References: <20130715162023.16676.87828.stgit@outback> <20130715162033.16676.48300.stgit@outback> Message-ID: <20130722205557.16294.58346@loki> Date: Mon, 22 Jul 2013 15:55:57 -0500 Subject: Re: [Qemu-devel] [PATCH v7 02/10] Add c++ keywords to QAPI helper script List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Tomoki Sekiyama , qemu-devel@nongnu.org Cc: libaiqing@huawei.com, ghammer@redhat.com, stefanha@gmail.com, lcapitulino@redhat.com, vrozenfe@redhat.com, pbonzini@redhat.com, seiji.aguchi@hds.com, Laszlo Ersek , areis@redhat.com Quoting Tomoki Sekiyama (2013-07-15 11:20:33) > Add c++ keywords to avoid errors in compiling with c++ compiler. > This also renames class member of PciDeviceInfo to q_class. > = > Signed-off-by: Tomoki Sekiyama > Reviewed-by: Laszlo Ersek Reviewed-by: Michael Roth > --- > hmp.c | 2 +- > hw/pci/pci.c | 2 +- > scripts/qapi.py | 12 +++++++++++- > 3 files changed, 13 insertions(+), 3 deletions(-) > = > diff --git a/hmp.c b/hmp.c > index 2daed43..69b1506 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -524,7 +524,7 @@ static void hmp_info_pci_device(Monitor *mon, const P= ciDeviceInfo *dev) > if (dev->class_info.has_desc) { > monitor_printf(mon, "%s", dev->class_info.desc); > } else { > - monitor_printf(mon, "Class %04" PRId64, dev->class_info.class); > + monitor_printf(mon, "Class %04" PRId64, dev->class_info.q_class); > } > = > monitor_printf(mon, ": PCI device %04" PRIx64 ":%04" PRIx64 "\n", > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index dcc85ef..5369996 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -1461,7 +1461,7 @@ static PciDeviceInfo *qmp_query_pci_device(PCIDevic= e *dev, PCIBus *bus, > info->function =3D PCI_FUNC(dev->devfn); > = > class =3D pci_get_word(dev->config + PCI_CLASS_DEVICE); > - info->class_info.class =3D class; > + info->class_info.q_class =3D class; > desc =3D get_class_desc(class); > if (desc->desc) { > info->class_info.has_desc =3D true; > diff --git a/scripts/qapi.py b/scripts/qapi.py > index baf1321..942bcc2 100644 > --- a/scripts/qapi.py > +++ b/scripts/qapi.py > @@ -169,9 +169,19 @@ def c_var(name, protect=3DTrue): > # GCC http://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/C-Extensions.html > # excluding _.* > gcc_words =3D set(['asm', 'typeof']) > + # C++ ISO/IEC 14882:2003 2.11 > + cpp_words =3D set(['bool', 'catch', 'class', 'const_cast', 'delete', > + 'dynamic_cast', 'explicit', 'false', 'friend', 'mut= able', > + 'namespace', 'new', 'operator', 'private', 'protect= ed', > + 'public', 'reinterpret_cast', 'static_cast', 'templ= ate', > + 'this', 'throw', 'true', 'try', 'typeid', 'typename= ', > + 'using', 'virtual', 'wchar_t', > + # alternative representations > + 'and', 'and_eq', 'bitand', 'bitor', 'compl', 'not', > + 'not_eq', 'or', 'or_eq', 'xor', 'xor_eq']) > # namespace pollution: > polluted_words =3D set(['unix']) > - if protect and (name in c89_words | c99_words | c11_words | gcc_word= s | polluted_words): > + if protect and (name in c89_words | c99_words | c11_words | gcc_word= s | cpp_words | polluted_words): > return "q_" + name > return name.replace('-', '_').lstrip("*")