OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi: Use 'if': { 'any': ... } where appropriate 

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Tested-by: John Snow <jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210804083105.97531-9-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Marc-André Lureau 2021-08-04 12:31:03 +04:00 committed by Markus Armbruster
parent 3ad64edfad
commit 8a156d89d1
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qapi/machine-target.json
View File

@ -213,7 +213,9 @@
##
{ 'struct': 'CpuModelExpansionInfo',
'data': { 'model': 'CpuModelInfo' },
'if': 'defined(TARGET_S390X) || defined(TARGET_I386) || defined(TARGET_ARM)' }
'if': { 'any': [ 'defined(TARGET_S390X)',
'defined(TARGET_I386)',
'defined(TARGET_ARM)'] } }
##
# @query-cpu-model-expansion:
@ -252,7 +254,9 @@
'data': { 'type': 'CpuModelExpansionType',
'model': 'CpuModelInfo' },
'returns': 'CpuModelExpansionInfo',
'if': 'defined(TARGET_S390X) || defined(TARGET_I386) || defined(TARGET_ARM)' }
'if': { 'any': [ 'defined(TARGET_S390X)',
'defined(TARGET_I386)',
'defined(TARGET_ARM)' ] } }
##
# @CpuDefinitionInfo:
@ -316,7 +320,11 @@
'typename': 'str',
'*alias-of' : 'str',
'deprecated' : 'bool' },
'if': 'defined(TARGET_PPC) || defined(TARGET_ARM) || defined(TARGET_I386) || defined(TARGET_S390X) || defined(TARGET_MIPS)' }
'if': { 'any': [ 'defined(TARGET_PPC)',
'defined(TARGET_ARM)',
'defined(TARGET_I386)',
'defined(TARGET_S390X)',
'defined(TARGET_MIPS)' ] } }
##
# @query-cpu-definitions:
@ -328,4 +336,8 @@
# Since: 1.2
##
{ 'command': 'query-cpu-definitions', 'returns': ['CpuDefinitionInfo'],
'if': 'defined(TARGET_PPC) || defined(TARGET_ARM) || defined(TARGET_I386) || defined(TARGET_S390X) || defined(TARGET_MIPS)' }
'if': { 'any': [ 'defined(TARGET_PPC)',
'defined(TARGET_ARM)',
'defined(TARGET_I386)',
'defined(TARGET_S390X)',
'defined(TARGET_MIPS)' ] } }

12
qapi/misc-target.json
View File

@ -23,7 +23,17 @@
##
{ 'event': 'RTC_CHANGE',
'data': { 'offset': 'int' },
'if': 'defined(TARGET_ALPHA) || defined(TARGET_ARM) || defined(TARGET_HPPA) || defined(TARGET_I386) || defined(TARGET_MIPS) || defined(TARGET_MIPS64) || defined(TARGET_PPC) || defined(TARGET_PPC64) || defined(TARGET_S390X) || defined(TARGET_SH4) || defined(TARGET_SPARC)' }
'if': { 'any': [ 'defined(TARGET_ALPHA)',
'defined(TARGET_ARM)',
'defined(TARGET_HPPA)',
'defined(TARGET_I386)',
'defined(TARGET_MIPS)',
'defined(TARGET_MIPS64)',
'defined(TARGET_PPC)',
'defined(TARGET_PPC64)',
'defined(TARGET_S390X)',
'defined(TARGET_SH4)',
'defined(TARGET_SPARC)' ] } }
##
# @rtc-reset-reinjection: