Commit 9a801c7d authored by Laszlo Ersek's avatar Laszlo Ersek Committed by Markus Armbruster
Browse files

qapi: add SysEmuTarget to "common.json" 



We'll soon need an enumeration type that lists all the softmmu targets
that QEMU (the project) supports. Introduce @SysEmuTarget to
"common.json".

The enum constant @x86_64 doesn't match the QAPI convention of preferring
hyphen ("-") over underscore ("_"). This is intentional; the @SysEmuTarget
constants are supposed to produce QEMU executable names when stringified
and appended to the "qemu-system-" prefix. Put differently, the
replacement text of the TARGET_NAME preprocessor macro must be possible to
look up in the list of (stringified) enum constants.

Like other enum types, @SysEmuTarget too can be used for discriminator
fields in unions. For the @i386 constant, a C-language union member called
"i386" would be generated. On mingw build hosts, "i386" is a macro
however. Add "i386" to "polluted_words" at once.

Cc: "Daniel P. Berrange" <berrange@redhat.com>
Cc: Eric Blake <eblake@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarLaszlo Ersek <lersek@redhat.com>
Message-Id: <20180427192852.15013-3-lersek@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 96054f56

qapi/common.json

+23 −0
Original line number Diff line number Diff line
@@ -126,3 +126,26 @@ 
##

{ 'enum': 'OffAutoPCIBAR',

  'data': [ 'off', 'auto', 'bar0', 'bar1', 'bar2', 'bar3', 'bar4', 'bar5' ] }



##

# @SysEmuTarget:

#

# The comprehensive enumeration of QEMU system emulation ("softmmu")

# targets. Run "./configure --help" in the project root directory, and

# look for the *-softmmu targets near the "--target-list" option. The

# individual target constants are not documented here, for the time

# being.

#

# Notes: The resulting QMP strings can be appended to the "qemu-system-"

#        prefix to produce the corresponding QEMU executable name. This

#        is true even for "qemu-system-x86_64".

#

# Since: 2.13

##

{ 'enum' : 'SysEmuTarget',

  'data' : [ 'aarch64', 'alpha', 'arm', 'cris', 'hppa', 'i386', 'lm32',

             'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64',

             'mips64el', 'mipsel', 'moxie', 'nios2', 'or1k', 'ppc',

             'ppc64', 'ppcemb', 'riscv32', 'riscv64', 's390x', 'sh4',

             'sh4eb', 'sparc', 'sparc64', 'tricore', 'unicore32',

             'x86_64', 'xtensa', 'xtensaeb' ] }

scripts/qapi/common.py

+1 −1
Original line number Diff line number Diff line
@@ -1822,7 +1822,7 @@ def c_name(name, protect=True): 
                     'and', 'and_eq', 'bitand', 'bitor', 'compl', 'not',

                     'not_eq', 'or', 'or_eq', 'xor', 'xor_eq'])

    # namespace pollution:

    polluted_words = set(['unix', 'errno', 'mips', 'sparc'])

    polluted_words = set(['unix', 'errno', 'mips', 'sparc', 'i386'])

    name = name.translate(c_name_trans)

    if protect and (name in c89_words | c99_words | c11_words | gcc_words

                    | cpp_words | polluted_words):