From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Eduardo Habkost" <ehabkost@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Laurent Vivier" <laurent@vivier.eu>,
"Markus Armbruster" <armbru@redhat.com>,
"Claudio Fontana" <cfontana@suse.de>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH v5 4/4] qapi/machine-target: Restrict X86 features to X86 targets
Date: Wed, 24 Feb 2021 23:46:43 +0100 [thread overview]
Message-ID: <20210224224643.3369940-5-philmd@redhat.com> (raw)
In-Reply-To: <20210224224643.3369940-1-philmd@redhat.com>
X86CPURegister32 enum and X86CPUFeatureWordInfo structure
are specific to the x86 architecture, restrict them to the
X86 targets.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
qapi/machine-target.json | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/qapi/machine-target.json b/qapi/machine-target.json
index 106fbd2e9ed..a8a5b3f86f6 100644
--- a/qapi/machine-target.json
+++ b/qapi/machine-target.json
@@ -338,7 +338,8 @@
# Since: 1.5
##
{ 'enum': 'X86CPURegister32',
- 'data': [ 'EAX', 'EBX', 'ECX', 'EDX', 'ESP', 'EBP', 'ESI', 'EDI' ] }
+ 'data': [ 'EAX', 'EBX', 'ECX', 'EDX', 'ESP', 'EBP', 'ESI', 'EDI' ],
+ 'if': 'defined(TARGET_I386)' }
##
# @X86CPUFeatureWordInfo:
@@ -360,7 +361,8 @@
'data': { 'cpuid-input-eax': 'int',
'*cpuid-input-ecx': 'int',
'cpuid-register': 'X86CPURegister32',
- 'features': 'int' } }
+ 'features': 'int' },
+ 'if': 'defined(TARGET_I386)' }
##
# @DummyForceArrays:
@@ -370,4 +372,5 @@
# Since: 2.5
##
{ 'struct': 'DummyForceArrays',
- 'data': { 'unused': ['X86CPUFeatureWordInfo'] } }
+ 'data': { 'unused': ['X86CPUFeatureWordInfo'] },
+ 'if': 'defined(TARGET_I386)' }
--
2.26.2
next prev parent reply other threads:[~2021-02-24 22:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-24 22:46 [PATCH v5 0/4] qapi: Restrict X86 features to X86 targets Philippe Mathieu-Daudé
2021-02-24 22:46 ` [PATCH v5 1/4] target/i386/cpu: Introduce get_register_enum_32() helper Philippe Mathieu-Daudé
2021-02-24 22:46 ` [PATCH v5 2/4] target/i386/cpu: Restrict x86_cpu_get_feature_words to sysemu Philippe Mathieu-Daudé
2021-02-24 22:46 ` [PATCH v5 3/4] qapi: Move X86 specific types to machine-target.json Philippe Mathieu-Daudé
2021-02-24 22:46 ` Philippe Mathieu-Daudé [this message]
2021-03-09 22:27 ` [PATCH v5 0/4] qapi: Restrict X86 features to X86 targets Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210224224643.3369940-5-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=armbru@redhat.com \
--cc=cfontana@suse.de \
--cc=ehabkost@redhat.com \
--cc=laurent@vivier.eu \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).