Commit 6f88009e authored by Tomoki Sekiyama's avatar Tomoki Sekiyama Committed by Michael Roth
Browse files

Add c++ keywords to QAPI helper script 



Add c++ keywords to avoid errors in compiling with c++ compiler.
This also renames class member of PciDeviceInfo to q_class.

Signed-off-by: default avatarTomoki Sekiyama <tomoki.sekiyama@hds.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent 83f73fce

hmp.c

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ static void hmp_info_pci_device(Monitor *mon, const PciDeviceInfo *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",

hw/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1461,7 +1461,7 @@ static PciDeviceInfo *qmp_query_pci_device(PCIDevice *dev, PCIBus *bus, 
    info->function = PCI_FUNC(dev->devfn);



    class = pci_get_word(dev->config + PCI_CLASS_DEVICE);

    info->class_info.class = class;

    info->class_info.q_class = class;

    desc = get_class_desc(class);

    if (desc->desc) {

        info->class_info.has_desc = true;

scripts/qapi.py

+11 −1
Original line number Diff line number Diff line
@@ -236,9 +236,19 @@ def c_var(name, protect=True): 
    # GCC http://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/C-Extensions.html

    # excluding _.*

    gcc_words = set(['asm', 'typeof'])

    # C++ ISO/IEC 14882:2003 2.11

    cpp_words = set(['bool', 'catch', 'class', 'const_cast', 'delete',

                     'dynamic_cast', 'explicit', 'false', 'friend', 'mutable',

                     'namespace', 'new', 'operator', 'private', 'protected',

                     'public', 'reinterpret_cast', 'static_cast', 'template',

                     '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 = set(['unix'])

    if protect and (name in c89_words | c99_words | c11_words | gcc_words | polluted_words):

    if protect and (name in c89_words | c99_words | c11_words | gcc_words | cpp_words | polluted_words):

        return "q_" + name

    return name.replace('-', '_').lstrip("*")