* [PATCH v2 01/12] qapi: expose rtc-reset-reinjection command unconditionally
2025-05-15 17:27 [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema Pierrick Bouvier
@ 2025-05-15 17:27 ` Pierrick Bouvier
2025-05-17 8:21 ` Markus Armbruster
2025-05-15 17:27 ` [PATCH v2 02/12] qapi: expand docs for SEV commands Pierrick Bouvier
` (11 subsequent siblings)
12 siblings, 1 reply; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Markus Armbruster, Peter Maydell
From: Daniel P. Berrangé <berrange@redhat.com>
This removes the TARGET_I386 condition from the rtc-reset-reinjection
command. This requires providing a QMP command stub for non-i386 target.
This in turn requires moving the command out of misc-target.json, since
that will trigger symbol poisoning errors when built from target
independent code.
Rather than putting the command into misc.json, it is proposed to create
misc-$TARGET.json files to hold commands whose impl is conceptually
only applicable to a single target. This gives an obvious docs hint to
consumers that the command is only useful in relation a specific target,
while misc.json is for commands applicable to 2 or more targets.
The current impl of qmp_rtc_reset_reinject() is a no-op if the i386
RTC is disabled in Kconfig, or if the running machine type lack any
RTC device.
The stub impl for non-i386 targets retains this no-op behaviour.
However, it is now reporting an Error mentioning this command is not
available for current target.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
qapi/misc-i386.json | 24 ++++++++++++++++++++++++
qapi/misc-target.json | 17 -----------------
qapi/qapi-schema.json | 1 +
hw/i386/monitor.c | 2 +-
stubs/monitor-i386-rtc.c | 11 +++++++++++
qapi/meson.build | 1 +
stubs/meson.build | 1 +
7 files changed, 39 insertions(+), 18 deletions(-)
create mode 100644 qapi/misc-i386.json
create mode 100644 stubs/monitor-i386-rtc.c
diff --git a/qapi/misc-i386.json b/qapi/misc-i386.json
new file mode 100644
index 00000000000..d5bfd91405e
--- /dev/null
+++ b/qapi/misc-i386.json
@@ -0,0 +1,24 @@
+# -*- Mode: Python -*-
+# vim: filetype=python
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+##
+# @rtc-reset-reinjection:
+#
+# This command will reset the RTC interrupt reinjection backlog. Can
+# be used if another mechanism to synchronize guest time is in effect,
+# for example QEMU guest agent's guest-set-time command.
+#
+# Use of this command is only applicable for x86 machines with an RTC,
+# and on other machines will silently return without performing any
+# action.
+#
+# Since: 2.1
+#
+# .. qmp-example::
+#
+# -> { "execute": "rtc-reset-reinjection" }
+# <- { "return": {} }
+##
+{ 'command': 'rtc-reset-reinjection' }
diff --git a/qapi/misc-target.json b/qapi/misc-target.json
index 42e4a7417dc..5d0ffb0164f 100644
--- a/qapi/misc-target.json
+++ b/qapi/misc-target.json
@@ -2,23 +2,6 @@
# vim: filetype=python
#
-##
-# @rtc-reset-reinjection:
-#
-# This command will reset the RTC interrupt reinjection backlog. Can
-# be used if another mechanism to synchronize guest time is in effect,
-# for example QEMU guest agent's guest-set-time command.
-#
-# Since: 2.1
-#
-# .. qmp-example::
-#
-# -> { "execute": "rtc-reset-reinjection" }
-# <- { "return": {} }
-##
-{ 'command': 'rtc-reset-reinjection',
- 'if': 'TARGET_I386' }
-
##
# @SevState:
#
diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json
index 7bc600bb768..96f6aa44133 100644
--- a/qapi/qapi-schema.json
+++ b/qapi/qapi-schema.json
@@ -61,6 +61,7 @@
{ 'include': 'replay.json' }
{ 'include': 'yank.json' }
{ 'include': 'misc.json' }
+{ 'include': 'misc-i386.json' }
{ 'include': 'misc-target.json' }
{ 'include': 'audio.json' }
{ 'include': 'acpi.json' }
diff --git a/hw/i386/monitor.c b/hw/i386/monitor.c
index 1921e4d52e9..79df96562f6 100644
--- a/hw/i386/monitor.c
+++ b/hw/i386/monitor.c
@@ -26,7 +26,7 @@
#include "monitor/monitor.h"
#include "qobject/qdict.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-misc-target.h"
+#include "qapi/qapi-commands-misc-i386.h"
#include "hw/i386/x86.h"
#include "hw/rtc/mc146818rtc.h"
diff --git a/stubs/monitor-i386-rtc.c b/stubs/monitor-i386-rtc.c
new file mode 100644
index 00000000000..d810f33efec
--- /dev/null
+++ b/stubs/monitor-i386-rtc.c
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-misc-i386.h"
+
+void qmp_rtc_reset_reinjection(Error **errp)
+{
+ error_setg(errp,
+ "rtc-reset-injection is only available for x86 machines with RTC");
+}
diff --git a/qapi/meson.build b/qapi/meson.build
index eadde4db307..3a9bd061047 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -64,6 +64,7 @@ if have_system
'qdev',
'pci',
'rocker',
+ 'misc-i386',
'tpm',
'uefi',
]
diff --git a/stubs/meson.build b/stubs/meson.build
index 63392f5e785..9907b54c1e6 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -77,6 +77,7 @@ if have_system
stub_ss.add(files('target-monitor-defs.c'))
stub_ss.add(files('win32-kbd-hook.c'))
stub_ss.add(files('xen-hw-stub.c'))
+ stub_ss.add(files('monitor-i386-rtc.c'))
endif
if have_system or have_user
--
2.47.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH v2 01/12] qapi: expose rtc-reset-reinjection command unconditionally
2025-05-15 17:27 ` [PATCH v2 01/12] qapi: expose rtc-reset-reinjection command unconditionally Pierrick Bouvier
@ 2025-05-17 8:21 ` Markus Armbruster
2025-05-17 19:39 ` Pierrick Bouvier
0 siblings, 1 reply; 28+ messages in thread
From: Markus Armbruster @ 2025-05-17 8:21 UTC (permalink / raw)
To: Pierrick Bouvier
Cc: qemu-devel, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Peter Maydell
Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
> From: Daniel P. Berrangé <berrange@redhat.com>
>
> This removes the TARGET_I386 condition from the rtc-reset-reinjection
> command. This requires providing a QMP command stub for non-i386 target.
> This in turn requires moving the command out of misc-target.json, since
> that will trigger symbol poisoning errors when built from target
> independent code.
>
> Rather than putting the command into misc.json, it is proposed to create
> misc-$TARGET.json files to hold commands whose impl is conceptually
> only applicable to a single target. This gives an obvious docs hint to
> consumers that the command is only useful in relation a specific target,
> while misc.json is for commands applicable to 2 or more targets.
>
> The current impl of qmp_rtc_reset_reinject() is a no-op if the i386
> RTC is disabled in Kconfig, or if the running machine type lack any
> RTC device.
>
> The stub impl for non-i386 targets retains this no-op behaviour.
> However, it is now reporting an Error mentioning this command is not
> available for current target.
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
[...]
> diff --git a/stubs/monitor-i386-rtc.c b/stubs/monitor-i386-rtc.c
> new file mode 100644
> index 00000000000..d810f33efec
> --- /dev/null
> +++ b/stubs/monitor-i386-rtc.c
> @@ -0,0 +1,11 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +
> +#include "qemu/osdep.h"
> +#include "qapi/error.h"
> +#include "qapi/qapi-commands-misc-i386.h"
> +
> +void qmp_rtc_reset_reinjection(Error **errp)
> +{
> + error_setg(errp,
> + "rtc-reset-injection is only available for x86 machines with RTC");
> +}
We get this stub exactly when the command did not exist before the
patch. Thus, the command fails before and after, only error code and
message change, which is fine.
However, the error message feels brittle: it becomes misleading when we
implement the command for other targets. Let's dumb it down to
something like "RTC interrupt reinjection backlog reset is not available
for this machine".
[...]
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH v2 01/12] qapi: expose rtc-reset-reinjection command unconditionally
2025-05-17 8:21 ` Markus Armbruster
@ 2025-05-17 19:39 ` Pierrick Bouvier
0 siblings, 0 replies; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-17 19:39 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Peter Maydell
On 5/17/25 1:21 AM, Markus Armbruster wrote:
> Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
>
>> From: Daniel P. Berrangé <berrange@redhat.com>
>>
>> This removes the TARGET_I386 condition from the rtc-reset-reinjection
>> command. This requires providing a QMP command stub for non-i386 target.
>> This in turn requires moving the command out of misc-target.json, since
>> that will trigger symbol poisoning errors when built from target
>> independent code.
>>
>> Rather than putting the command into misc.json, it is proposed to create
>> misc-$TARGET.json files to hold commands whose impl is conceptually
>> only applicable to a single target. This gives an obvious docs hint to
>> consumers that the command is only useful in relation a specific target,
>> while misc.json is for commands applicable to 2 or more targets.
>>
>> The current impl of qmp_rtc_reset_reinject() is a no-op if the i386
>> RTC is disabled in Kconfig, or if the running machine type lack any
>> RTC device.
>>
>> The stub impl for non-i386 targets retains this no-op behaviour.
>> However, it is now reporting an Error mentioning this command is not
>> available for current target.
>>
>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>
> [...]
>
>> diff --git a/stubs/monitor-i386-rtc.c b/stubs/monitor-i386-rtc.c
>> new file mode 100644
>> index 00000000000..d810f33efec
>> --- /dev/null
>> +++ b/stubs/monitor-i386-rtc.c
>> @@ -0,0 +1,11 @@
>> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>> +
>> +#include "qemu/osdep.h"
>> +#include "qapi/error.h"
>> +#include "qapi/qapi-commands-misc-i386.h"
>> +
>> +void qmp_rtc_reset_reinjection(Error **errp)
>> +{
>> + error_setg(errp,
>> + "rtc-reset-injection is only available for x86 machines with RTC");
>> +}
>
> We get this stub exactly when the command did not exist before the
> patch. Thus, the command fails before and after, only error code and
> message change, which is fine.
>
> However, the error message feels brittle: it becomes misleading when we
> implement the command for other targets. Let's dumb it down to
> something like "RTC interrupt reinjection backlog reset is not available
> for this machine".
>
Sounds good, I'll change it.
> [...]
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 02/12] qapi: expand docs for SEV commands
2025-05-15 17:27 [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema Pierrick Bouvier
2025-05-15 17:27 ` [PATCH v2 01/12] qapi: expose rtc-reset-reinjection command unconditionally Pierrick Bouvier
@ 2025-05-15 17:27 ` Pierrick Bouvier
2025-05-19 5:57 ` Markus Armbruster
2025-05-15 17:27 ` [PATCH v2 03/12] qapi: make SEV commands unconditionally available Pierrick Bouvier
` (10 subsequent siblings)
12 siblings, 1 reply; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Markus Armbruster, Peter Maydell
From: Daniel P. Berrangé <berrange@redhat.com>
This gives some more context about the behaviour of the commands in
unsupported guest configuration or platform scenarios.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
qapi/misc-target.json | 43 ++++++++++++++++++++++++++++++++++++-------
1 file changed, 36 insertions(+), 7 deletions(-)
diff --git a/qapi/misc-target.json b/qapi/misc-target.json
index 5d0ffb0164f..ae55e437a5f 100644
--- a/qapi/misc-target.json
+++ b/qapi/misc-target.json
@@ -110,7 +110,11 @@
##
# @query-sev:
#
-# Returns information about SEV
+# Returns information about SEV/SEV-ES/SEV-SNP.
+#
+# If unavailable due to an incompatible configuration the
+# returned @enabled field will be set to 'false' and the
+# state of all other fields is undefined.
#
# Returns: @SevInfo
#
@@ -141,7 +145,16 @@
##
# @query-sev-launch-measure:
#
-# Query the SEV guest launch information.
+# Query the SEV/SEV-ES guest launch information.
+#
+# This is only valid on x86 machines configured with KVM and the
+# 'sev-guest' confidential virtualization object. The launch
+# measurement for SEV-SNP guests is only available within
+# the guest.
+#
+# This will return an error if the launch measurement is
+# unavailable, either due to an invalid guest configuration
+# or if the guest has not reached the required SEV state.
#
# Returns: The @SevLaunchMeasureInfo for the guest
#
@@ -185,8 +198,9 @@
##
# @query-sev-capabilities:
#
-# This command is used to get the SEV capabilities, and is supported
-# on AMD X86 platforms only.
+# This command is used to get the SEV capabilities, and is only
+# supported on AMD X86 platforms with KVM enabled. If SEV is not
+# available on the platform an error will be returned.
#
# Returns: SevCapability objects.
#
@@ -205,7 +219,15 @@
##
# @sev-inject-launch-secret:
#
-# This command injects a secret blob into memory of SEV guest.
+# This command injects a secret blob into memory of a SEV/SEV-ES guest.
+#
+# This is only valid on x86 machines configured with KVM and the
+# 'sev-guest' confidential virtualization object. SEV-SNP guests
+# do not support launch secret injection
+#
+# This will return an error if launch secret injection is not possible,
+# either due to an invalid guest configuration, or if the guest has not
+# reached the required SEV state.
#
# @packet-header: the launch secret packet header encoded in base64
#
@@ -236,8 +258,15 @@
##
# @query-sev-attestation-report:
#
-# This command is used to get the SEV attestation report, and is
-# supported on AMD X86 platforms only.
+# This command is used to get the SEV attestation report.
+#
+# This is only valid on x86 machines configured with KVM and the
+# 'sev-guest' confidential virtualization object. The attestation
+# report for SEV-SNP guests is only available within the guest.
+#
+# This will return an error if the attestation report is
+# unavailable, either due to an invalid guest configuration
+# or if the guest has not reached the required SEV state.
#
# @mnonce: a random 16 bytes value encoded in base64 (it will be
# included in report)
--
2.47.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH v2 02/12] qapi: expand docs for SEV commands
2025-05-15 17:27 ` [PATCH v2 02/12] qapi: expand docs for SEV commands Pierrick Bouvier
@ 2025-05-19 5:57 ` Markus Armbruster
2025-05-21 19:21 ` Pierrick Bouvier
0 siblings, 1 reply; 28+ messages in thread
From: Markus Armbruster @ 2025-05-19 5:57 UTC (permalink / raw)
To: Pierrick Bouvier
Cc: qemu-devel, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Peter Maydell
Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
> From: Daniel P. Berrangé <berrange@redhat.com>
>
> This gives some more context about the behaviour of the commands in
> unsupported guest configuration or platform scenarios.
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> ---
> qapi/misc-target.json | 43 ++++++++++++++++++++++++++++++++++++-------
> 1 file changed, 36 insertions(+), 7 deletions(-)
>
> diff --git a/qapi/misc-target.json b/qapi/misc-target.json
> index 5d0ffb0164f..ae55e437a5f 100644
> --- a/qapi/misc-target.json
> +++ b/qapi/misc-target.json
> @@ -110,7 +110,11 @@
> ##
> # @query-sev:
> #
> -# Returns information about SEV
> +# Returns information about SEV/SEV-ES/SEV-SNP.
We prefer imperative mood "Return" over "Returns". Could also use "Get"
or "Query"; matter of taste.
> +#
> +# If unavailable due to an incompatible configuration the
> +# returned @enabled field will be set to 'false' and the
I'd prefer "field is set".
> +# state of all other fields is undefined.
> #
> # Returns: @SevInfo
> #
> @@ -141,7 +145,16 @@
> ##
> # @query-sev-launch-measure:
> #
> -# Query the SEV guest launch information.
> +# Query the SEV/SEV-ES guest launch information.
> +#
> +# This is only valid on x86 machines configured with KVM and the
> +# 'sev-guest' confidential virtualization object. The launch
> +# measurement for SEV-SNP guests is only available within
> +# the guest.
> +#
> +# This will return an error if the launch measurement is
> +# unavailable, either due to an invalid guest configuration
> +# or if the guest has not reached the required SEV state.
> #
> # Returns: The @SevLaunchMeasureInfo for the guest
> #
Errors better go into their own section.
# Returns: The @SevLaunchMeasureInfo for the guest
#
# Errors:
# - If the launch measurement is unavailable, either due to an
# invalid guest configuration or if the guest has not reached
# the required SEV state, GenericError
> @@ -185,8 +198,9 @@
> ##
> # @query-sev-capabilities:
> #
> -# This command is used to get the SEV capabilities, and is supported
> -# on AMD X86 platforms only.
> +# This command is used to get the SEV capabilities, and is only
> +# supported on AMD X86 platforms with KVM enabled. If SEV is not
> +# available on the platform an error will be returned.
> #
> # Returns: SevCapability objects.
> #
Likewise.
Suggest to use the opportunity to switch the intro to imperative mood.
Together:
##
# Get SEV capabilities.
#
# This is only supported on AMD X86 platforms with KVM enabled.
#
# Returns: SevCapability objects.
#
# Errors:
# - If # SEV is not available on the platform, GenericError
#
> @@ -205,7 +219,15 @@
> ##
> # @sev-inject-launch-secret:
> #
> -# This command injects a secret blob into memory of SEV guest.
> +# This command injects a secret blob into memory of a SEV/SEV-ES guest.
> +#
> +# This is only valid on x86 machines configured with KVM and the
> +# 'sev-guest' confidential virtualization object. SEV-SNP guests
> +# do not support launch secret injection
> +#
> +# This will return an error if launch secret injection is not possible,
> +# either due to an invalid guest configuration, or if the guest has not
> +# reached the required SEV state.
> #
> # @packet-header: the launch secret packet header encoded in base64
> #
Likewise.
> @@ -236,8 +258,15 @@
> ##
> # @query-sev-attestation-report:
> #
> -# This command is used to get the SEV attestation report, and is
> -# supported on AMD X86 platforms only.
> +# This command is used to get the SEV attestation report.
> +#
> +# This is only valid on x86 machines configured with KVM and the
> +# 'sev-guest' confidential virtualization object. The attestation
> +# report for SEV-SNP guests is only available within the guest.
> +#
> +# This will return an error if the attestation report is
> +# unavailable, either due to an invalid guest configuration
> +# or if the guest has not reached the required SEV state.
> #
> # @mnonce: a random 16 bytes value encoded in base64 (it will be
> # included in report)
Likewise.
docs/devel/qapi-code-gen.rst:
For legibility, wrap text paragraphs so every line is at most 70
characters long.
Separate sentences with two spaces.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH v2 02/12] qapi: expand docs for SEV commands
2025-05-19 5:57 ` Markus Armbruster
@ 2025-05-21 19:21 ` Pierrick Bouvier
0 siblings, 0 replies; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-21 19:21 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Peter Maydell
On 5/18/25 10:57 PM, Markus Armbruster wrote:
> Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
>
>> From: Daniel P. Berrangé <berrange@redhat.com>
>>
>> This gives some more context about the behaviour of the commands in
>> unsupported guest configuration or platform scenarios.
>>
>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>> ---
>> qapi/misc-target.json | 43 ++++++++++++++++++++++++++++++++++++-------
>> 1 file changed, 36 insertions(+), 7 deletions(-)
>>
>> diff --git a/qapi/misc-target.json b/qapi/misc-target.json
>> index 5d0ffb0164f..ae55e437a5f 100644
>> --- a/qapi/misc-target.json
>> +++ b/qapi/misc-target.json
>> @@ -110,7 +110,11 @@
>> ##
>> # @query-sev:
>> #
>> -# Returns information about SEV
>> +# Returns information about SEV/SEV-ES/SEV-SNP.
>
> We prefer imperative mood "Return" over "Returns". Could also use "Get"
> or "Query"; matter of taste.
>
>> +#
>> +# If unavailable due to an incompatible configuration the
>> +# returned @enabled field will be set to 'false' and the
>
> I'd prefer "field is set".
>
>> +# state of all other fields is undefined.
>> #
>> # Returns: @SevInfo
>> #
>> @@ -141,7 +145,16 @@
>> ##
>> # @query-sev-launch-measure:
>> #
>> -# Query the SEV guest launch information.
>> +# Query the SEV/SEV-ES guest launch information.
>> +#
>> +# This is only valid on x86 machines configured with KVM and the
>> +# 'sev-guest' confidential virtualization object. The launch
>> +# measurement for SEV-SNP guests is only available within
>> +# the guest.
>> +#
>> +# This will return an error if the launch measurement is
>> +# unavailable, either due to an invalid guest configuration
>> +# or if the guest has not reached the required SEV state.
>> #
>> # Returns: The @SevLaunchMeasureInfo for the guest
>> #
>
> Errors better go into their own section.
>
> # Returns: The @SevLaunchMeasureInfo for the guest
> #
> # Errors:
> # - If the launch measurement is unavailable, either due to an
> # invalid guest configuration or if the guest has not reached
> # the required SEV state, GenericError
>
>> @@ -185,8 +198,9 @@
>> ##
>> # @query-sev-capabilities:
>> #
>> -# This command is used to get the SEV capabilities, and is supported
>> -# on AMD X86 platforms only.
>> +# This command is used to get the SEV capabilities, and is only
>> +# supported on AMD X86 platforms with KVM enabled. If SEV is not
>> +# available on the platform an error will be returned.
>> #
>> # Returns: SevCapability objects.
>> #
>
> Likewise.
>
> Suggest to use the opportunity to switch the intro to imperative mood.
> Together:
>
> ##
> # Get SEV capabilities.
> #
> # This is only supported on AMD X86 platforms with KVM enabled.
> #
> # Returns: SevCapability objects.
> #
> # Errors:
> # - If # SEV is not available on the platform, GenericError
> #
>
>> @@ -205,7 +219,15 @@
>> ##
>> # @sev-inject-launch-secret:
>> #
>> -# This command injects a secret blob into memory of SEV guest.
>> +# This command injects a secret blob into memory of a SEV/SEV-ES guest.
>> +#
>> +# This is only valid on x86 machines configured with KVM and the
>> +# 'sev-guest' confidential virtualization object. SEV-SNP guests
>> +# do not support launch secret injection
>> +#
>> +# This will return an error if launch secret injection is not possible,
>> +# either due to an invalid guest configuration, or if the guest has not
>> +# reached the required SEV state.
>> #
>> # @packet-header: the launch secret packet header encoded in base64
>> #
>
> Likewise.
>
>> @@ -236,8 +258,15 @@
>> ##
>> # @query-sev-attestation-report:
>> #
>> -# This command is used to get the SEV attestation report, and is
>> -# supported on AMD X86 platforms only.
>> +# This command is used to get the SEV attestation report.
>> +#
>> +# This is only valid on x86 machines configured with KVM and the
>> +# 'sev-guest' confidential virtualization object. The attestation
>> +# report for SEV-SNP guests is only available within the guest.
>> +#
>> +# This will return an error if the attestation report is
>> +# unavailable, either due to an invalid guest configuration
>> +# or if the guest has not reached the required SEV state.
>> #
>> # @mnonce: a random 16 bytes value encoded in base64 (it will be
>> # included in report)
>
> Likewise.
>
> docs/devel/qapi-code-gen.rst:
>
> For legibility, wrap text paragraphs so every line is at most 70
> characters long.
>
> Separate sentences with two spaces.
>
All changes done, as requested.
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 03/12] qapi: make SEV commands unconditionally available
2025-05-15 17:27 [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema Pierrick Bouvier
2025-05-15 17:27 ` [PATCH v2 01/12] qapi: expose rtc-reset-reinjection command unconditionally Pierrick Bouvier
2025-05-15 17:27 ` [PATCH v2 02/12] qapi: expand docs for SEV commands Pierrick Bouvier
@ 2025-05-15 17:27 ` Pierrick Bouvier
2025-05-15 17:27 ` [PATCH v2 04/12] qapi: expose query-gic-capability command unconditionally Pierrick Bouvier
` (9 subsequent siblings)
12 siblings, 0 replies; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Markus Armbruster, Peter Maydell
From: Daniel P. Berrangé <berrange@redhat.com>
This removes the TARGET_I386 condition from the SEV confidential
virtualization commands, moving them to the recently introduced
misc-i386.json QAPI file, given they are inherantly i386 specific
commands.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
qapi/misc-i386.json | 271 ++++++++++++++++++++++++++++++++
qapi/misc-target.json | 284 ----------------------------------
stubs/monitor-i386-sev.c | 36 +++++
target/i386/sev-system-stub.c | 32 ----
target/i386/sev.c | 2 +-
stubs/meson.build | 1 +
6 files changed, 309 insertions(+), 317 deletions(-)
create mode 100644 stubs/monitor-i386-sev.c
diff --git a/qapi/misc-i386.json b/qapi/misc-i386.json
index d5bfd91405e..de0e4ab67ff 100644
--- a/qapi/misc-i386.json
+++ b/qapi/misc-i386.json
@@ -22,3 +22,274 @@
# <- { "return": {} }
##
{ 'command': 'rtc-reset-reinjection' }
+
+##
+# @SevState:
+#
+# An enumeration of SEV state information used during @query-sev.
+#
+# @uninit: The guest is uninitialized.
+#
+# @launch-update: The guest is currently being launched; plaintext
+# data and register state is being imported.
+#
+# @launch-secret: The guest is currently being launched; ciphertext
+# data is being imported.
+#
+# @running: The guest is fully launched or migrated in.
+#
+# @send-update: The guest is currently being migrated out to another
+# machine.
+#
+# @receive-update: The guest is currently being migrated from another
+# machine.
+#
+# Since: 2.12
+##
+{ 'enum': 'SevState',
+ 'data': ['uninit', 'launch-update', 'launch-secret', 'running',
+ 'send-update', 'receive-update' ] }
+
+##
+# @SevGuestType:
+#
+# An enumeration indicating the type of SEV guest being run.
+#
+# @sev: The guest is a legacy SEV or SEV-ES guest.
+#
+# @sev-snp: The guest is an SEV-SNP guest.
+#
+# Since: 6.2
+##
+{ 'enum': 'SevGuestType',
+ 'data': [ 'sev', 'sev-snp' ] }
+
+##
+# @SevGuestInfo:
+#
+# Information specific to legacy SEV/SEV-ES guests.
+#
+# @policy: SEV policy value
+#
+# @handle: SEV firmware handle
+#
+# Since: 2.12
+##
+{ 'struct': 'SevGuestInfo',
+ 'data': { 'policy': 'uint32',
+ 'handle': 'uint32' } }
+
+##
+# @SevSnpGuestInfo:
+#
+# Information specific to SEV-SNP guests.
+#
+# @snp-policy: SEV-SNP policy value
+#
+# Since: 9.1
+##
+{ 'struct': 'SevSnpGuestInfo',
+ 'data': { 'snp-policy': 'uint64' } }
+
+##
+# @SevInfo:
+#
+# Information about Secure Encrypted Virtualization (SEV) support
+#
+# @enabled: true if SEV is active
+#
+# @api-major: SEV API major version
+#
+# @api-minor: SEV API minor version
+#
+# @build-id: SEV FW build id
+#
+# @state: SEV guest state
+#
+# @sev-type: Type of SEV guest being run
+#
+# Since: 2.12
+##
+{ 'union': 'SevInfo',
+ 'base': { 'enabled': 'bool',
+ 'api-major': 'uint8',
+ 'api-minor' : 'uint8',
+ 'build-id' : 'uint8',
+ 'state' : 'SevState',
+ 'sev-type' : 'SevGuestType' },
+ 'discriminator': 'sev-type',
+ 'data': {
+ 'sev': 'SevGuestInfo',
+ 'sev-snp': 'SevSnpGuestInfo' } }
+
+
+##
+# @query-sev:
+#
+# Returns information about SEV/SEV-ES/SEV-SNP.
+#
+# If unavailable due to an incompatible configuration the
+# returned @enabled field will be set to 'false' and the
+# state of all other fields is undefined.
+#
+# Returns: @SevInfo
+#
+# Since: 2.12
+#
+# .. qmp-example::
+#
+# -> { "execute": "query-sev" }
+# <- { "return": { "enabled": true, "api-major" : 0, "api-minor" : 0,
+# "build-id" : 0, "policy" : 0, "state" : "running",
+# "handle" : 1 } }
+##
+{ 'command': 'query-sev', 'returns': 'SevInfo' }
+
+##
+# @SevLaunchMeasureInfo:
+#
+# SEV Guest Launch measurement information
+#
+# @data: the measurement value encoded in base64
+#
+# Since: 2.12
+##
+{ 'struct': 'SevLaunchMeasureInfo', 'data': {'data': 'str'} }
+
+##
+# @query-sev-launch-measure:
+#
+# Query the SEV/SEV-ES guest launch information.
+#
+# This is only valid on x86 machines configured with KVM and the
+# 'sev-guest' confidential virtualization object. The launch
+# measurement for SEV-SNP guests is only available within
+# the guest.
+#
+# This will return an error if the launch measurement is
+# unavailable, either due to an invalid guest configuration
+# or if the guest has not reached the required SEV state.
+#
+# Returns: The @SevLaunchMeasureInfo for the guest
+#
+# Since: 2.12
+#
+# .. qmp-example::
+#
+# -> { "execute": "query-sev-launch-measure" }
+# <- { "return": { "data": "4l8LXeNlSPUDlXPJG5966/8%YZ" } }
+##
+{ 'command': 'query-sev-launch-measure', 'returns': 'SevLaunchMeasureInfo' }
+
+##
+# @SevCapability:
+#
+# The struct describes capability for a Secure Encrypted
+# Virtualization feature.
+#
+# @pdh: Platform Diffie-Hellman key (base64 encoded)
+#
+# @cert-chain: PDH certificate chain (base64 encoded)
+#
+# @cpu0-id: Unique ID of CPU0 (base64 encoded) (since 7.1)
+#
+# @cbitpos: C-bit location in page table entry
+#
+# @reduced-phys-bits: Number of physical Address bit reduction when
+# SEV is enabled
+#
+# Since: 2.12
+##
+{ 'struct': 'SevCapability',
+ 'data': { 'pdh': 'str',
+ 'cert-chain': 'str',
+ 'cpu0-id': 'str',
+ 'cbitpos': 'int',
+ 'reduced-phys-bits': 'int'} }
+
+##
+# @query-sev-capabilities:
+#
+# This command is used to get the SEV capabilities, and is only
+# supported on AMD X86 platforms with KVM enabled. If SEV is not
+# available on the platform an error will be returned.
+#
+# Returns: SevCapability objects.
+#
+# Since: 2.12
+#
+# .. qmp-example::
+#
+# -> { "execute": "query-sev-capabilities" }
+# <- { "return": { "pdh": "8CCDD8DDD", "cert-chain": "888CCCDDDEE",
+# "cpu0-id": "2lvmGwo+...61iEinw==",
+# "cbitpos": 47, "reduced-phys-bits": 1}}
+##
+{ 'command': 'query-sev-capabilities', 'returns': 'SevCapability' }
+
+##
+# @sev-inject-launch-secret:
+#
+# This command injects a secret blob into memory of a SEV/SEV-ES guest.
+#
+# This is only valid on x86 machines configured with KVM and the
+# 'sev-guest' confidential virtualization object. SEV-SNP guests
+# do not support launch secret injection
+#
+# This will return an error if launch secret injection is not possible,
+# either due to an invalid guest configuration, or if the guest has not
+# reached the required SEV state.
+#
+# @packet-header: the launch secret packet header encoded in base64
+#
+# @secret: the launch secret data to be injected encoded in base64
+#
+# @gpa: the guest physical address where secret will be injected.
+#
+# Since: 6.0
+##
+{ 'command': 'sev-inject-launch-secret',
+ 'data': { 'packet-header': 'str', 'secret': 'str', '*gpa': 'uint64' } }
+
+##
+# @SevAttestationReport:
+#
+# The struct describes attestation report for a Secure Encrypted
+# Virtualization feature.
+#
+# @data: guest attestation report (base64 encoded)
+#
+# Since: 6.1
+##
+{ 'struct': 'SevAttestationReport',
+ 'data': { 'data': 'str'} }
+
+##
+# @query-sev-attestation-report:
+#
+# This command is used to get the SEV attestation report.
+#
+# This is only valid on x86 machines configured with KVM and the
+# 'sev-guest' confidential virtualization object. The attestation
+# report for SEV-SNP guests is only available within the guest.
+#
+# This will return an error if the attestation report is
+# unavailable, either due to an invalid guest configuration
+# or if the guest has not reached the required SEV state.
+#
+# @mnonce: a random 16 bytes value encoded in base64 (it will be
+# included in report)
+#
+# Returns: SevAttestationReport objects.
+#
+# Since: 6.1
+#
+# .. qmp-example::
+#
+# -> { "execute" : "query-sev-attestation-report",
+# "arguments": { "mnonce": "aaaaaaa" } }
+# <- { "return" : { "data": "aaaaaaaabbbddddd"} }
+##
+{ 'command': 'query-sev-attestation-report',
+ 'data': { 'mnonce': 'str' },
+ 'returns': 'SevAttestationReport' }
diff --git a/qapi/misc-target.json b/qapi/misc-target.json
index ae55e437a5f..ba4403a9241 100644
--- a/qapi/misc-target.json
+++ b/qapi/misc-target.json
@@ -2,290 +2,6 @@
# vim: filetype=python
#
-##
-# @SevState:
-#
-# An enumeration of SEV state information used during @query-sev.
-#
-# @uninit: The guest is uninitialized.
-#
-# @launch-update: The guest is currently being launched; plaintext
-# data and register state is being imported.
-#
-# @launch-secret: The guest is currently being launched; ciphertext
-# data is being imported.
-#
-# @running: The guest is fully launched or migrated in.
-#
-# @send-update: The guest is currently being migrated out to another
-# machine.
-#
-# @receive-update: The guest is currently being migrated from another
-# machine.
-#
-# Since: 2.12
-##
-{ 'enum': 'SevState',
- 'data': ['uninit', 'launch-update', 'launch-secret', 'running',
- 'send-update', 'receive-update' ],
- 'if': 'TARGET_I386' }
-
-##
-# @SevGuestType:
-#
-# An enumeration indicating the type of SEV guest being run.
-#
-# @sev: The guest is a legacy SEV or SEV-ES guest.
-#
-# @sev-snp: The guest is an SEV-SNP guest.
-#
-# Since: 6.2
-##
-{ 'enum': 'SevGuestType',
- 'data': [ 'sev', 'sev-snp' ],
- 'if': 'TARGET_I386' }
-
-##
-# @SevGuestInfo:
-#
-# Information specific to legacy SEV/SEV-ES guests.
-#
-# @policy: SEV policy value
-#
-# @handle: SEV firmware handle
-#
-# Since: 2.12
-##
-{ 'struct': 'SevGuestInfo',
- 'data': { 'policy': 'uint32',
- 'handle': 'uint32' },
- 'if': 'TARGET_I386' }
-
-##
-# @SevSnpGuestInfo:
-#
-# Information specific to SEV-SNP guests.
-#
-# @snp-policy: SEV-SNP policy value
-#
-# Since: 9.1
-##
-{ 'struct': 'SevSnpGuestInfo',
- 'data': { 'snp-policy': 'uint64' },
- 'if': 'TARGET_I386' }
-
-##
-# @SevInfo:
-#
-# Information about Secure Encrypted Virtualization (SEV) support
-#
-# @enabled: true if SEV is active
-#
-# @api-major: SEV API major version
-#
-# @api-minor: SEV API minor version
-#
-# @build-id: SEV FW build id
-#
-# @state: SEV guest state
-#
-# @sev-type: Type of SEV guest being run
-#
-# Since: 2.12
-##
-{ 'union': 'SevInfo',
- 'base': { 'enabled': 'bool',
- 'api-major': 'uint8',
- 'api-minor' : 'uint8',
- 'build-id' : 'uint8',
- 'state' : 'SevState',
- 'sev-type' : 'SevGuestType' },
- 'discriminator': 'sev-type',
- 'data': {
- 'sev': 'SevGuestInfo',
- 'sev-snp': 'SevSnpGuestInfo' },
- 'if': 'TARGET_I386' }
-
-
-##
-# @query-sev:
-#
-# Returns information about SEV/SEV-ES/SEV-SNP.
-#
-# If unavailable due to an incompatible configuration the
-# returned @enabled field will be set to 'false' and the
-# state of all other fields is undefined.
-#
-# Returns: @SevInfo
-#
-# Since: 2.12
-#
-# .. qmp-example::
-#
-# -> { "execute": "query-sev" }
-# <- { "return": { "enabled": true, "api-major" : 0, "api-minor" : 0,
-# "build-id" : 0, "policy" : 0, "state" : "running",
-# "handle" : 1 } }
-##
-{ 'command': 'query-sev', 'returns': 'SevInfo',
- 'if': 'TARGET_I386' }
-
-##
-# @SevLaunchMeasureInfo:
-#
-# SEV Guest Launch measurement information
-#
-# @data: the measurement value encoded in base64
-#
-# Since: 2.12
-##
-{ 'struct': 'SevLaunchMeasureInfo', 'data': {'data': 'str'},
- 'if': 'TARGET_I386' }
-
-##
-# @query-sev-launch-measure:
-#
-# Query the SEV/SEV-ES guest launch information.
-#
-# This is only valid on x86 machines configured with KVM and the
-# 'sev-guest' confidential virtualization object. The launch
-# measurement for SEV-SNP guests is only available within
-# the guest.
-#
-# This will return an error if the launch measurement is
-# unavailable, either due to an invalid guest configuration
-# or if the guest has not reached the required SEV state.
-#
-# Returns: The @SevLaunchMeasureInfo for the guest
-#
-# Since: 2.12
-#
-# .. qmp-example::
-#
-# -> { "execute": "query-sev-launch-measure" }
-# <- { "return": { "data": "4l8LXeNlSPUDlXPJG5966/8%YZ" } }
-##
-{ 'command': 'query-sev-launch-measure', 'returns': 'SevLaunchMeasureInfo',
- 'if': 'TARGET_I386' }
-
-##
-# @SevCapability:
-#
-# The struct describes capability for a Secure Encrypted
-# Virtualization feature.
-#
-# @pdh: Platform Diffie-Hellman key (base64 encoded)
-#
-# @cert-chain: PDH certificate chain (base64 encoded)
-#
-# @cpu0-id: Unique ID of CPU0 (base64 encoded) (since 7.1)
-#
-# @cbitpos: C-bit location in page table entry
-#
-# @reduced-phys-bits: Number of physical Address bit reduction when
-# SEV is enabled
-#
-# Since: 2.12
-##
-{ 'struct': 'SevCapability',
- 'data': { 'pdh': 'str',
- 'cert-chain': 'str',
- 'cpu0-id': 'str',
- 'cbitpos': 'int',
- 'reduced-phys-bits': 'int'},
- 'if': 'TARGET_I386' }
-
-##
-# @query-sev-capabilities:
-#
-# This command is used to get the SEV capabilities, and is only
-# supported on AMD X86 platforms with KVM enabled. If SEV is not
-# available on the platform an error will be returned.
-#
-# Returns: SevCapability objects.
-#
-# Since: 2.12
-#
-# .. qmp-example::
-#
-# -> { "execute": "query-sev-capabilities" }
-# <- { "return": { "pdh": "8CCDD8DDD", "cert-chain": "888CCCDDDEE",
-# "cpu0-id": "2lvmGwo+...61iEinw==",
-# "cbitpos": 47, "reduced-phys-bits": 1}}
-##
-{ 'command': 'query-sev-capabilities', 'returns': 'SevCapability',
- 'if': 'TARGET_I386' }
-
-##
-# @sev-inject-launch-secret:
-#
-# This command injects a secret blob into memory of a SEV/SEV-ES guest.
-#
-# This is only valid on x86 machines configured with KVM and the
-# 'sev-guest' confidential virtualization object. SEV-SNP guests
-# do not support launch secret injection
-#
-# This will return an error if launch secret injection is not possible,
-# either due to an invalid guest configuration, or if the guest has not
-# reached the required SEV state.
-#
-# @packet-header: the launch secret packet header encoded in base64
-#
-# @secret: the launch secret data to be injected encoded in base64
-#
-# @gpa: the guest physical address where secret will be injected.
-#
-# Since: 6.0
-##
-{ 'command': 'sev-inject-launch-secret',
- 'data': { 'packet-header': 'str', 'secret': 'str', '*gpa': 'uint64' },
- 'if': 'TARGET_I386' }
-
-##
-# @SevAttestationReport:
-#
-# The struct describes attestation report for a Secure Encrypted
-# Virtualization feature.
-#
-# @data: guest attestation report (base64 encoded)
-#
-# Since: 6.1
-##
-{ 'struct': 'SevAttestationReport',
- 'data': { 'data': 'str'},
- 'if': 'TARGET_I386' }
-
-##
-# @query-sev-attestation-report:
-#
-# This command is used to get the SEV attestation report.
-#
-# This is only valid on x86 machines configured with KVM and the
-# 'sev-guest' confidential virtualization object. The attestation
-# report for SEV-SNP guests is only available within the guest.
-#
-# This will return an error if the attestation report is
-# unavailable, either due to an invalid guest configuration
-# or if the guest has not reached the required SEV state.
-#
-# @mnonce: a random 16 bytes value encoded in base64 (it will be
-# included in report)
-#
-# Returns: SevAttestationReport objects.
-#
-# Since: 6.1
-#
-# .. qmp-example::
-#
-# -> { "execute" : "query-sev-attestation-report",
-# "arguments": { "mnonce": "aaaaaaa" } }
-# <- { "return" : { "data": "aaaaaaaabbbddddd"} }
-##
-{ 'command': 'query-sev-attestation-report',
- 'data': { 'mnonce': 'str' },
- 'returns': 'SevAttestationReport',
- 'if': 'TARGET_I386' }
-
##
# @GICCapability:
#
diff --git a/stubs/monitor-i386-sev.c b/stubs/monitor-i386-sev.c
new file mode 100644
index 00000000000..d4f024128ca
--- /dev/null
+++ b/stubs/monitor-i386-sev.c
@@ -0,0 +1,36 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-misc-i386.h"
+
+SevInfo *qmp_query_sev(Error **errp)
+{
+ error_setg(errp, "SEV is not available in this QEMU");
+ return NULL;
+}
+
+SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp)
+{
+ error_setg(errp, "SEV is not available in this QEMU");
+ return NULL;
+}
+
+SevCapability *qmp_query_sev_capabilities(Error **errp)
+{
+ error_setg(errp, "SEV is not available in this QEMU");
+ return NULL;
+}
+
+void qmp_sev_inject_launch_secret(const char *packet_header, const char *secret,
+ bool has_gpa, uint64_t gpa, Error **errp)
+{
+ error_setg(errp, "SEV is not available in this QEMU");
+}
+
+SevAttestationReport *qmp_query_sev_attestation_report(const char *mnonce,
+ Error **errp)
+{
+ error_setg(errp, "SEV is not available in this QEMU");
+ return NULL;
+}
diff --git a/target/i386/sev-system-stub.c b/target/i386/sev-system-stub.c
index d5bf886e799..7c5c02a5657 100644
--- a/target/i386/sev-system-stub.c
+++ b/target/i386/sev-system-stub.c
@@ -14,34 +14,9 @@
#include "qemu/osdep.h"
#include "monitor/monitor.h"
#include "monitor/hmp-target.h"
-#include "qapi/qapi-commands-misc-target.h"
#include "qapi/error.h"
#include "sev.h"
-SevInfo *qmp_query_sev(Error **errp)
-{
- error_setg(errp, "SEV is not available in this QEMU");
- return NULL;
-}
-
-SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp)
-{
- error_setg(errp, "SEV is not available in this QEMU");
- return NULL;
-}
-
-SevCapability *qmp_query_sev_capabilities(Error **errp)
-{
- error_setg(errp, "SEV is not available in this QEMU");
- return NULL;
-}
-
-void qmp_sev_inject_launch_secret(const char *packet_header, const char *secret,
- bool has_gpa, uint64_t gpa, Error **errp)
-{
- error_setg(errp, "SEV is not available in this QEMU");
-}
-
int sev_encrypt_flash(hwaddr gpa, uint8_t *ptr, uint64_t len, Error **errp)
{
g_assert_not_reached();
@@ -56,13 +31,6 @@ int sev_es_save_reset_vector(void *flash_ptr, uint64_t flash_size)
g_assert_not_reached();
}
-SevAttestationReport *qmp_query_sev_attestation_report(const char *mnonce,
- Error **errp)
-{
- error_setg(errp, "SEV is not available in this QEMU");
- return NULL;
-}
-
void hmp_info_sev(Monitor *mon, const QDict *qdict)
{
monitor_printf(mon, "SEV is not available in this QEMU\n");
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 7ee700d6a35..56dd64e659a 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -37,7 +37,7 @@
#include "qom/object.h"
#include "monitor/monitor.h"
#include "monitor/hmp-target.h"
-#include "qapi/qapi-commands-misc-target.h"
+#include "qapi/qapi-commands-misc-i386.h"
#include "confidential-guest.h"
#include "hw/i386/pc.h"
#include "system/address-spaces.h"
diff --git a/stubs/meson.build b/stubs/meson.build
index 9907b54c1e6..9922ec7b88e 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -78,6 +78,7 @@ if have_system
stub_ss.add(files('win32-kbd-hook.c'))
stub_ss.add(files('xen-hw-stub.c'))
stub_ss.add(files('monitor-i386-rtc.c'))
+ stub_ss.add(files('monitor-i386-sev.c'))
endif
if have_system or have_user
--
2.47.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH v2 04/12] qapi: expose query-gic-capability command unconditionally
2025-05-15 17:27 [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema Pierrick Bouvier
` (2 preceding siblings ...)
2025-05-15 17:27 ` [PATCH v2 03/12] qapi: make SEV commands unconditionally available Pierrick Bouvier
@ 2025-05-15 17:27 ` Pierrick Bouvier
2025-05-15 17:27 ` [PATCH v2 05/12] qapi: make SGX commands unconditionally available Pierrick Bouvier
` (8 subsequent siblings)
12 siblings, 0 replies; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Markus Armbruster, Peter Maydell
From: Daniel P. Berrangé <berrange@redhat.com>
This removes the TARGET_ARM condition from the query-gic-capability
command. This requires providing a QMP command stub for non-ARM targets.
This in turn requires moving the command out of misc-target.json, since
that will trigger symbol poisoning errors when built from target
independent code.
Following the earlier precedent, this creates a misc-arm.json file to
hold this ARM specific command.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
qapi/misc-arm.json | 49 +++++++++++++++++++++++++++++++++++++++
qapi/misc-target.json | 44 -----------------------------------
qapi/qapi-schema.json | 1 +
stubs/monitor-arm-gic.c | 12 ++++++++++
target/arm/arm-qmp-cmds.c | 2 +-
qapi/meson.build | 1 +
stubs/meson.build | 1 +
7 files changed, 65 insertions(+), 45 deletions(-)
create mode 100644 qapi/misc-arm.json
create mode 100644 stubs/monitor-arm-gic.c
diff --git a/qapi/misc-arm.json b/qapi/misc-arm.json
new file mode 100644
index 00000000000..f5341372f5a
--- /dev/null
+++ b/qapi/misc-arm.json
@@ -0,0 +1,49 @@
+# -*- Mode: Python -*-
+# vim: filetype=python
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+##
+# @GICCapability:
+#
+# The struct describes capability for a specific GIC (Generic
+# Interrupt Controller) version. These bits are not only decided by
+# QEMU/KVM software version, but also decided by the hardware that the
+# program is running upon.
+#
+# @version: version of GIC to be described. Currently, only 2 and 3
+# are supported.
+#
+# @emulated: whether current QEMU/hardware supports emulated GIC
+# device in user space.
+#
+# @kernel: whether current QEMU/hardware supports hardware accelerated
+# GIC device in kernel.
+#
+# Since: 2.6
+##
+{ 'struct': 'GICCapability',
+ 'data': { 'version': 'int',
+ 'emulated': 'bool',
+ 'kernel': 'bool' } }
+
+##
+# @query-gic-capabilities:
+#
+# It will return a list of GICCapability objects that describe its
+# capability bits.
+#
+# On non-ARM targets this command will report an error as the GIC
+# technology is not applicable.
+#
+# Returns: a list of GICCapability objects.
+#
+# Since: 2.6
+#
+# .. qmp-example::
+#
+# -> { "execute": "query-gic-capabilities" }
+# <- { "return": [{ "version": 2, "emulated": true, "kernel": false },
+# { "version": 3, "emulated": false, "kernel": true } ] }
+##
+{ 'command': 'query-gic-capabilities', 'returns': ['GICCapability'] }
diff --git a/qapi/misc-target.json b/qapi/misc-target.json
index ba4403a9241..d36292b3321 100644
--- a/qapi/misc-target.json
+++ b/qapi/misc-target.json
@@ -2,50 +2,6 @@
# vim: filetype=python
#
-##
-# @GICCapability:
-#
-# The struct describes capability for a specific GIC (Generic
-# Interrupt Controller) version. These bits are not only decided by
-# QEMU/KVM software version, but also decided by the hardware that the
-# program is running upon.
-#
-# @version: version of GIC to be described. Currently, only 2 and 3
-# are supported.
-#
-# @emulated: whether current QEMU/hardware supports emulated GIC
-# device in user space.
-#
-# @kernel: whether current QEMU/hardware supports hardware accelerated
-# GIC device in kernel.
-#
-# Since: 2.6
-##
-{ 'struct': 'GICCapability',
- 'data': { 'version': 'int',
- 'emulated': 'bool',
- 'kernel': 'bool' },
- 'if': 'TARGET_ARM' }
-
-##
-# @query-gic-capabilities:
-#
-# This command is ARM-only. It will return a list of GICCapability
-# objects that describe its capability bits.
-#
-# Returns: a list of GICCapability objects.
-#
-# Since: 2.6
-#
-# .. qmp-example::
-#
-# -> { "execute": "query-gic-capabilities" }
-# <- { "return": [{ "version": 2, "emulated": true, "kernel": false },
-# { "version": 3, "emulated": false, "kernel": true } ] }
-##
-{ 'command': 'query-gic-capabilities', 'returns': ['GICCapability'],
- 'if': 'TARGET_ARM' }
-
##
# @SGXEPCSection:
#
diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json
index 96f6aa44133..e96bff8d38c 100644
--- a/qapi/qapi-schema.json
+++ b/qapi/qapi-schema.json
@@ -61,6 +61,7 @@
{ 'include': 'replay.json' }
{ 'include': 'yank.json' }
{ 'include': 'misc.json' }
+{ 'include': 'misc-arm.json' }
{ 'include': 'misc-i386.json' }
{ 'include': 'misc-target.json' }
{ 'include': 'audio.json' }
diff --git a/stubs/monitor-arm-gic.c b/stubs/monitor-arm-gic.c
new file mode 100644
index 00000000000..b3429243ef8
--- /dev/null
+++ b/stubs/monitor-arm-gic.c
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-misc-arm.h"
+
+
+GICCapabilityList *qmp_query_gic_capabilities(Error **errp)
+{
+ error_setg(errp, "GIC hardware is not available on this target");
+ return NULL;
+}
diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c
index a1a944adb43..ef18c867ca4 100644
--- a/target/arm/arm-qmp-cmds.c
+++ b/target/arm/arm-qmp-cmds.c
@@ -27,7 +27,7 @@
#include "qapi/visitor.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-commands-machine-target.h"
-#include "qapi/qapi-commands-misc-target.h"
+#include "qapi/qapi-commands-misc-arm.h"
#include "qobject/qdict.h"
#include "qom/qom-qobject.h"
diff --git a/qapi/meson.build b/qapi/meson.build
index 3a9bd061047..5e93e6b8cfd 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -64,6 +64,7 @@ if have_system
'qdev',
'pci',
'rocker',
+ 'misc-arm',
'misc-i386',
'tpm',
'uefi',
diff --git a/stubs/meson.build b/stubs/meson.build
index 9922ec7b88e..07e9d3799a5 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -77,6 +77,7 @@ if have_system
stub_ss.add(files('target-monitor-defs.c'))
stub_ss.add(files('win32-kbd-hook.c'))
stub_ss.add(files('xen-hw-stub.c'))
+ stub_ss.add(files('monitor-arm-gic.c'))
stub_ss.add(files('monitor-i386-rtc.c'))
stub_ss.add(files('monitor-i386-sev.c'))
endif
--
2.47.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH v2 05/12] qapi: make SGX commands unconditionally available
2025-05-15 17:27 [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema Pierrick Bouvier
` (3 preceding siblings ...)
2025-05-15 17:27 ` [PATCH v2 04/12] qapi: expose query-gic-capability command unconditionally Pierrick Bouvier
@ 2025-05-15 17:27 ` Pierrick Bouvier
2025-05-15 17:27 ` [PATCH v2 06/12] qapi: make Xen event " Pierrick Bouvier
` (7 subsequent siblings)
12 siblings, 0 replies; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Markus Armbruster, Peter Maydell
From: Daniel P. Berrangé <berrange@redhat.com>
This removes the TARGET_I386 condition from the SGX confidential
virtualization commands, moving them to the recently introduced
misc-i386.json QAPI file, given they are inherantly i386 specific
commands.
Observe a pre-existing bug that the "SGXEPCSection" struct lacked
a TARGET_I386 condition, despite its only usage being behind a
TARGET_I386 condition.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
qapi/misc-i386.json | 77 +++++++++++++++++++++++++++++++++++++++
qapi/misc-target.json | 78 ----------------------------------------
hw/i386/sgx-stub.c | 13 -------
hw/i386/sgx.c | 2 +-
stubs/monitor-i386-sgx.c | 17 +++++++++
stubs/meson.build | 1 +
6 files changed, 96 insertions(+), 92 deletions(-)
create mode 100644 stubs/monitor-i386-sgx.c
diff --git a/qapi/misc-i386.json b/qapi/misc-i386.json
index de0e4ab67ff..0ddc297ccbf 100644
--- a/qapi/misc-i386.json
+++ b/qapi/misc-i386.json
@@ -293,3 +293,80 @@
{ 'command': 'query-sev-attestation-report',
'data': { 'mnonce': 'str' },
'returns': 'SevAttestationReport' }
+
+##
+# @SGXEPCSection:
+#
+# Information about intel SGX EPC section info
+#
+# @node: the numa node
+#
+# @size: the size of EPC section
+#
+# Since: 7.0
+##
+{ 'struct': 'SGXEPCSection',
+ 'data': { 'node': 'int',
+ 'size': 'uint64'}}
+
+##
+# @SGXInfo:
+#
+# Information about intel Safe Guard eXtension (SGX) support
+#
+# @sgx: true if SGX is supported
+#
+# @sgx1: true if SGX1 is supported
+#
+# @sgx2: true if SGX2 is supported
+#
+# @flc: true if FLC is supported
+#
+# @sections: The EPC sections info for guest (Since: 7.0)
+#
+# Since: 6.2
+##
+{ 'struct': 'SGXInfo',
+ 'data': { 'sgx': 'bool',
+ 'sgx1': 'bool',
+ 'sgx2': 'bool',
+ 'flc': 'bool',
+ 'sections': ['SGXEPCSection']} }
+
+##
+# @query-sgx:
+#
+# Returns information about SGX
+#
+# Returns: @SGXInfo
+#
+# Since: 6.2
+#
+# .. qmp-example::
+#
+# -> { "execute": "query-sgx" }
+# <- { "return": { "sgx": true, "sgx1" : true, "sgx2" : true,
+# "flc": true,
+# "sections": [{"node": 0, "size": 67108864},
+# {"node": 1, "size": 29360128}]} }
+##
+{ 'command': 'query-sgx', 'returns': 'SGXInfo' }
+
+##
+# @query-sgx-capabilities:
+#
+# Returns information from host SGX capabilities
+#
+# Returns: @SGXInfo
+#
+# Since: 6.2
+#
+# .. qmp-example::
+#
+# -> { "execute": "query-sgx-capabilities" }
+# <- { "return": { "sgx": true, "sgx1" : true, "sgx2" : true,
+# "flc": true,
+# "section" : [{"node": 0, "size": 67108864},
+# {"node": 1, "size": 29360128}]} }
+##
+{ 'command': 'query-sgx-capabilities', 'returns': 'SGXInfo' }
diff --git a/qapi/misc-target.json b/qapi/misc-target.json
index d36292b3321..d9368a1f21f 100644
--- a/qapi/misc-target.json
+++ b/qapi/misc-target.json
@@ -2,84 +2,6 @@
# vim: filetype=python
#
-##
-# @SGXEPCSection:
-#
-# Information about intel SGX EPC section info
-#
-# @node: the numa node
-#
-# @size: the size of EPC section
-#
-# Since: 7.0
-##
-{ 'struct': 'SGXEPCSection',
- 'data': { 'node': 'int',
- 'size': 'uint64'}}
-
-##
-# @SGXInfo:
-#
-# Information about intel Safe Guard eXtension (SGX) support
-#
-# @sgx: true if SGX is supported
-#
-# @sgx1: true if SGX1 is supported
-#
-# @sgx2: true if SGX2 is supported
-#
-# @flc: true if FLC is supported
-#
-# @sections: The EPC sections info for guest (Since: 7.0)
-#
-# Since: 6.2
-##
-{ 'struct': 'SGXInfo',
- 'data': { 'sgx': 'bool',
- 'sgx1': 'bool',
- 'sgx2': 'bool',
- 'flc': 'bool',
- 'sections': ['SGXEPCSection']},
- 'if': 'TARGET_I386' }
-
-##
-# @query-sgx:
-#
-# Returns information about SGX
-#
-# Returns: @SGXInfo
-#
-# Since: 6.2
-#
-# .. qmp-example::
-#
-# -> { "execute": "query-sgx" }
-# <- { "return": { "sgx": true, "sgx1" : true, "sgx2" : true,
-# "flc": true,
-# "sections": [{"node": 0, "size": 67108864},
-# {"node": 1, "size": 29360128}]} }
-##
-{ 'command': 'query-sgx', 'returns': 'SGXInfo', 'if': 'TARGET_I386' }
-
-##
-# @query-sgx-capabilities:
-#
-# Returns information from host SGX capabilities
-#
-# Returns: @SGXInfo
-#
-# Since: 6.2
-#
-# .. qmp-example::
-#
-# -> { "execute": "query-sgx-capabilities" }
-# <- { "return": { "sgx": true, "sgx1" : true, "sgx2" : true,
-# "flc": true,
-# "section" : [{"node": 0, "size": 67108864},
-# {"node": 1, "size": 29360128}]} }
-##
-{ 'command': 'query-sgx-capabilities', 'returns': 'SGXInfo', 'if': 'TARGET_I386' }
-
##
# @EvtchnPortType:
diff --git a/hw/i386/sgx-stub.c b/hw/i386/sgx-stub.c
index 38ff75e9f37..10ffcdd154d 100644
--- a/hw/i386/sgx-stub.c
+++ b/hw/i386/sgx-stub.c
@@ -4,24 +4,11 @@
#include "hw/i386/pc.h"
#include "hw/i386/sgx-epc.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-misc-target.h"
void sgx_epc_build_srat(GArray *table_data)
{
}
-SGXInfo *qmp_query_sgx(Error **errp)
-{
- error_setg(errp, "SGX support is not compiled in");
- return NULL;
-}
-
-SGXInfo *qmp_query_sgx_capabilities(Error **errp)
-{
- error_setg(errp, "SGX support is not compiled in");
- return NULL;
-}
-
void hmp_info_sgx(Monitor *mon, const QDict *qdict)
{
monitor_printf(mon, "SGX is not available in this QEMU\n");
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
index 5685c4fb802..2b10a8d144e 100644
--- a/hw/i386/sgx.c
+++ b/hw/i386/sgx.c
@@ -19,7 +19,7 @@
#include "monitor/hmp-target.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
-#include "qapi/qapi-commands-misc-target.h"
+#include "qapi/qapi-commands-misc-i386.h"
#include "system/address-spaces.h"
#include "system/hw_accel.h"
#include "system/reset.h"
diff --git a/stubs/monitor-i386-sgx.c b/stubs/monitor-i386-sgx.c
new file mode 100644
index 00000000000..55a4f194f3f
--- /dev/null
+++ b/stubs/monitor-i386-sgx.c
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-misc-i386.h"
+
+SGXInfo *qmp_query_sgx(Error **errp)
+{
+ error_setg(errp, "SGX support is not compiled in");
+ return NULL;
+}
+
+SGXInfo *qmp_query_sgx_capabilities(Error **errp)
+{
+ error_setg(errp, "SGX support is not compiled in");
+ return NULL;
+}
diff --git a/stubs/meson.build b/stubs/meson.build
index 07e9d3799a5..f2eb4880181 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -80,6 +80,7 @@ if have_system
stub_ss.add(files('monitor-arm-gic.c'))
stub_ss.add(files('monitor-i386-rtc.c'))
stub_ss.add(files('monitor-i386-sev.c'))
+ stub_ss.add(files('monitor-i386-sgx.c'))
endif
if have_system or have_user
--
2.47.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH v2 06/12] qapi: make Xen event commands unconditionally available
2025-05-15 17:27 [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema Pierrick Bouvier
` (4 preceding siblings ...)
2025-05-15 17:27 ` [PATCH v2 05/12] qapi: make SGX commands unconditionally available Pierrick Bouvier
@ 2025-05-15 17:27 ` Pierrick Bouvier
2025-05-15 17:27 ` [PATCH v2 07/12] qapi: remove the misc-target.json file Pierrick Bouvier
` (6 subsequent siblings)
12 siblings, 0 replies; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Markus Armbruster, Peter Maydell, David Woodhouse
From: Daniel P. Berrangé <berrange@redhat.com>
This removes the TARGET_I386 condition from the Xen event channel
commands, moving them to the recently introduced misc-i386.json
QAPI file, given they are inherantly i386 specific commands.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Acked-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
qapi/misc-i386.json | 107 +++++++++++++++++++++++++++++++++++++
qapi/misc-target.json | 112 ---------------------------------------
hw/i386/kvm/xen-stubs.c | 13 -----
hw/i386/kvm/xen_evtchn.c | 2 +-
stubs/monitor-i386-xen.c | 16 ++++++
stubs/meson.build | 1 +
6 files changed, 125 insertions(+), 126 deletions(-)
create mode 100644 stubs/monitor-i386-xen.c
diff --git a/qapi/misc-i386.json b/qapi/misc-i386.json
index 0ddc297ccbf..3d3f373a6be 100644
--- a/qapi/misc-i386.json
+++ b/qapi/misc-i386.json
@@ -370,3 +370,110 @@
# {"node": 1, "size": 29360128}]} }
##
{ 'command': 'query-sgx-capabilities', 'returns': 'SGXInfo' }
+
+##
+# @EvtchnPortType:
+#
+# An enumeration of Xen event channel port types.
+#
+# @closed: The port is unused.
+#
+# @unbound: The port is allocated and ready to be bound.
+#
+# @interdomain: The port is connected as an interdomain interrupt.
+#
+# @pirq: The port is bound to a physical IRQ (PIRQ).
+#
+# @virq: The port is bound to a virtual IRQ (VIRQ).
+#
+# @ipi: The post is an inter-processor interrupt (IPI).
+#
+# Since: 8.0
+##
+{ 'enum': 'EvtchnPortType',
+ 'data': ['closed', 'unbound', 'interdomain', 'pirq', 'virq', 'ipi'] }
+
+##
+# @EvtchnInfo:
+#
+# Information about a Xen event channel port
+#
+# @port: the port number
+#
+# @vcpu: target vCPU for this port
+#
+# @type: the port type
+#
+# @remote-domain: remote domain for interdomain ports
+#
+# @target: remote port ID, or virq/pirq number
+#
+# @pending: port is currently active pending delivery
+#
+# @masked: port is masked
+#
+# Since: 8.0
+##
+{ 'struct': 'EvtchnInfo',
+ 'data': {'port': 'uint16',
+ 'vcpu': 'uint32',
+ 'type': 'EvtchnPortType',
+ 'remote-domain': 'str',
+ 'target': 'uint16',
+ 'pending': 'bool',
+ 'masked': 'bool'} }
+
+
+##
+# @xen-event-list:
+#
+# Query the Xen event channels opened by the guest.
+#
+# Returns: list of open event channel ports.
+#
+# Since: 8.0
+#
+# .. qmp-example::
+#
+# -> { "execute": "xen-event-list" }
+# <- { "return": [
+# {
+# "pending": false,
+# "port": 1,
+# "vcpu": 1,
+# "remote-domain": "qemu",
+# "masked": false,
+# "type": "interdomain",
+# "target": 1
+# },
+# {
+# "pending": false,
+# "port": 2,
+# "vcpu": 0,
+# "remote-domain": "",
+# "masked": false,
+# "type": "virq",
+# "target": 0
+# }
+# ]
+# }
+##
+{ 'command': 'xen-event-list',
+ 'returns': ['EvtchnInfo'] }
+
+##
+# @xen-event-inject:
+#
+# Inject a Xen event channel port (interrupt) to the guest.
+#
+# @port: The port number
+#
+# Since: 8.0
+#
+# .. qmp-example::
+#
+# -> { "execute": "xen-event-inject", "arguments": { "port": 1 } }
+# <- { "return": { } }
+##
+{ 'command': 'xen-event-inject',
+ 'data': { 'port': 'uint32' } }
diff --git a/qapi/misc-target.json b/qapi/misc-target.json
index d9368a1f21f..c9ea1ab23e7 100644
--- a/qapi/misc-target.json
+++ b/qapi/misc-target.json
@@ -1,115 +1,3 @@
# -*- Mode: Python -*-
# vim: filetype=python
#
-
-
-##
-# @EvtchnPortType:
-#
-# An enumeration of Xen event channel port types.
-#
-# @closed: The port is unused.
-#
-# @unbound: The port is allocated and ready to be bound.
-#
-# @interdomain: The port is connected as an interdomain interrupt.
-#
-# @pirq: The port is bound to a physical IRQ (PIRQ).
-#
-# @virq: The port is bound to a virtual IRQ (VIRQ).
-#
-# @ipi: The post is an inter-processor interrupt (IPI).
-#
-# Since: 8.0
-##
-{ 'enum': 'EvtchnPortType',
- 'data': ['closed', 'unbound', 'interdomain', 'pirq', 'virq', 'ipi'],
- 'if': 'TARGET_I386' }
-
-##
-# @EvtchnInfo:
-#
-# Information about a Xen event channel port
-#
-# @port: the port number
-#
-# @vcpu: target vCPU for this port
-#
-# @type: the port type
-#
-# @remote-domain: remote domain for interdomain ports
-#
-# @target: remote port ID, or virq/pirq number
-#
-# @pending: port is currently active pending delivery
-#
-# @masked: port is masked
-#
-# Since: 8.0
-##
-{ 'struct': 'EvtchnInfo',
- 'data': {'port': 'uint16',
- 'vcpu': 'uint32',
- 'type': 'EvtchnPortType',
- 'remote-domain': 'str',
- 'target': 'uint16',
- 'pending': 'bool',
- 'masked': 'bool'},
- 'if': 'TARGET_I386' }
-
-
-##
-# @xen-event-list:
-#
-# Query the Xen event channels opened by the guest.
-#
-# Returns: list of open event channel ports.
-#
-# Since: 8.0
-#
-# .. qmp-example::
-#
-# -> { "execute": "xen-event-list" }
-# <- { "return": [
-# {
-# "pending": false,
-# "port": 1,
-# "vcpu": 1,
-# "remote-domain": "qemu",
-# "masked": false,
-# "type": "interdomain",
-# "target": 1
-# },
-# {
-# "pending": false,
-# "port": 2,
-# "vcpu": 0,
-# "remote-domain": "",
-# "masked": false,
-# "type": "virq",
-# "target": 0
-# }
-# ]
-# }
-##
-{ 'command': 'xen-event-list',
- 'returns': ['EvtchnInfo'],
- 'if': 'TARGET_I386' }
-
-##
-# @xen-event-inject:
-#
-# Inject a Xen event channel port (interrupt) to the guest.
-#
-# @port: The port number
-#
-# Since: 8.0
-#
-# .. qmp-example::
-#
-# -> { "execute": "xen-event-inject", "arguments": { "port": 1 } }
-# <- { "return": { } }
-##
-{ 'command': 'xen-event-inject',
- 'data': { 'port': 'uint32' },
- 'if': 'TARGET_I386' }
diff --git a/hw/i386/kvm/xen-stubs.c b/hw/i386/kvm/xen-stubs.c
index d03131e6864..ce73119ee7a 100644
--- a/hw/i386/kvm/xen-stubs.c
+++ b/hw/i386/kvm/xen-stubs.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-misc-target.h"
#include "xen_evtchn.h"
#include "xen_primary_console.h"
@@ -38,15 +37,3 @@ void xen_primary_console_create(void)
void xen_primary_console_set_be_port(uint16_t port)
{
}
-#ifdef TARGET_I386
-EvtchnInfoList *qmp_xen_event_list(Error **errp)
-{
- error_setg(errp, "Xen event channel emulation not enabled");
- return NULL;
-}
-
-void qmp_xen_event_inject(uint32_t port, Error **errp)
-{
- error_setg(errp, "Xen event channel emulation not enabled");
-}
-#endif
diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
index b5190549a81..dd566c49679 100644
--- a/hw/i386/kvm/xen_evtchn.c
+++ b/hw/i386/kvm/xen_evtchn.c
@@ -19,7 +19,7 @@
#include "monitor/monitor.h"
#include "monitor/hmp.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-misc-target.h"
+#include "qapi/qapi-commands-misc-i386.h"
#include "qobject/qdict.h"
#include "qom/object.h"
#include "exec/target_page.h"
diff --git a/stubs/monitor-i386-xen.c b/stubs/monitor-i386-xen.c
new file mode 100644
index 00000000000..95b826f9795
--- /dev/null
+++ b/stubs/monitor-i386-xen.c
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-misc-i386.h"
+
+EvtchnInfoList *qmp_xen_event_list(Error **errp)
+{
+ error_setg(errp, "Xen event channel emulation not enabled");
+ return NULL;
+}
+
+void qmp_xen_event_inject(uint32_t port, Error **errp)
+{
+ error_setg(errp, "Xen event channel emulation not enabled");
+}
diff --git a/stubs/meson.build b/stubs/meson.build
index f2eb4880181..0ef11976a2f 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -81,6 +81,7 @@ if have_system
stub_ss.add(files('monitor-i386-rtc.c'))
stub_ss.add(files('monitor-i386-sev.c'))
stub_ss.add(files('monitor-i386-sgx.c'))
+ stub_ss.add(files('monitor-i386-xen.c'))
endif
if have_system or have_user
--
2.47.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH v2 07/12] qapi: remove the misc-target.json file
2025-05-15 17:27 [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema Pierrick Bouvier
` (5 preceding siblings ...)
2025-05-15 17:27 ` [PATCH v2 06/12] qapi: make Xen event " Pierrick Bouvier
@ 2025-05-15 17:27 ` Pierrick Bouvier
2025-05-15 17:27 ` [PATCH v2 08/12] qapi: Make CpuModelExpansionInfo::deprecated-props optional and generic Pierrick Bouvier
` (5 subsequent siblings)
12 siblings, 0 replies; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Markus Armbruster, Peter Maydell
From: Daniel P. Berrangé <berrange@redhat.com>
This file is now empty and can thus be removed.
Observe the pre-existing bug with s390-skeys.c and target/i386/monitor.c
both including qapi-commands-misc-target.h despite not requiring it.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
qapi/misc-target.json | 3 ---
qapi/qapi-schema.json | 1 -
hw/s390x/s390-skeys.c | 1 -
target/i386/monitor.c | 1 -
qapi/meson.build | 1 -
5 files changed, 7 deletions(-)
delete mode 100644 qapi/misc-target.json
diff --git a/qapi/misc-target.json b/qapi/misc-target.json
deleted file mode 100644
index c9ea1ab23e7..00000000000
--- a/qapi/misc-target.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- Mode: Python -*-
-# vim: filetype=python
-#
diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json
index e96bff8d38c..d8eb79cfda6 100644
--- a/qapi/qapi-schema.json
+++ b/qapi/qapi-schema.json
@@ -63,7 +63,6 @@
{ 'include': 'misc.json' }
{ 'include': 'misc-arm.json' }
{ 'include': 'misc-i386.json' }
-{ 'include': 'misc-target.json' }
{ 'include': 'audio.json' }
{ 'include': 'acpi.json' }
{ 'include': 'pci.json' }
diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c
index aedb62b2d31..8eeecfd58fc 100644
--- a/hw/s390x/s390-skeys.c
+++ b/hw/s390x/s390-skeys.c
@@ -17,7 +17,6 @@
#include "hw/s390x/storage-keys.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-machine.h"
-#include "qapi/qapi-commands-misc-target.h"
#include "qobject/qdict.h"
#include "qemu/error-report.h"
#include "system/memory_mapping.h"
diff --git a/target/i386/monitor.c b/target/i386/monitor.c
index 3ea92b066e1..3c9b6ca62f2 100644
--- a/target/i386/monitor.c
+++ b/target/i386/monitor.c
@@ -29,7 +29,6 @@
#include "monitor/hmp.h"
#include "qobject/qdict.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-misc-target.h"
#include "qapi/qapi-commands-misc.h"
/* Perform linear address sign extension */
diff --git a/qapi/meson.build b/qapi/meson.build
index 5e93e6b8cfd..ffe44f9e0b8 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -42,7 +42,6 @@ qapi_all_modules = [
'machine-target',
'migration',
'misc',
- 'misc-target',
'net',
'pragma',
'qom',
--
2.47.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH v2 08/12] qapi: Make CpuModelExpansionInfo::deprecated-props optional and generic
2025-05-15 17:27 [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema Pierrick Bouvier
` (6 preceding siblings ...)
2025-05-15 17:27 ` [PATCH v2 07/12] qapi: remove the misc-target.json file Pierrick Bouvier
@ 2025-05-15 17:27 ` Pierrick Bouvier
2025-05-19 6:18 ` Markus Armbruster
2025-05-15 17:27 ` [PATCH v2 09/12] qapi: make most CPU commands unconditionally available Pierrick Bouvier
` (4 subsequent siblings)
12 siblings, 1 reply; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Markus Armbruster, Peter Maydell
From: Philippe Mathieu-Daudé <philmd@linaro.org>
We'd like to have some unified QAPI schema. Having a structure field
conditional to a target being built in is not very practical.
While @deprecated-props is only used by s390x target, it is generic
enough and could be used by other targets (assuming we expand
CpuModelExpansionType enum values).
Let's always include this field, regardless of the target, but
make it optional.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
qapi/machine-target.json | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/qapi/machine-target.json b/qapi/machine-target.json
index 426ce4ee82d..e153291a7fc 100644
--- a/qapi/machine-target.json
+++ b/qapi/machine-target.json
@@ -244,19 +244,18 @@
#
# @model: the expanded CpuModelInfo.
#
-# @deprecated-props: a list of properties that are flagged as
+# @deprecated-props: an optional list of properties that are flagged as
# deprecated by the CPU vendor. The list depends on the
# CpuModelExpansionType: "static" properties are a subset of the
# enabled-properties for the expanded model; "full" properties are
# a set of properties that are deprecated across all models for
-# the architecture. (since: 9.1).
+# the architecture. (since: 10.1 -- since 9.1 on s390x --).
#
# Since: 2.8
##
{ 'struct': 'CpuModelExpansionInfo',
'data': { 'model': 'CpuModelInfo',
- 'deprecated-props' : { 'type': ['str'],
- 'if': 'TARGET_S390X' } },
+ '*deprecated-props' : { 'type': ['str'] } },
'if': { 'any': [ 'TARGET_S390X',
'TARGET_I386',
'TARGET_ARM',
--
2.47.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH v2 08/12] qapi: Make CpuModelExpansionInfo::deprecated-props optional and generic
2025-05-15 17:27 ` [PATCH v2 08/12] qapi: Make CpuModelExpansionInfo::deprecated-props optional and generic Pierrick Bouvier
@ 2025-05-19 6:18 ` Markus Armbruster
2025-05-21 19:22 ` Pierrick Bouvier
0 siblings, 1 reply; 28+ messages in thread
From: Markus Armbruster @ 2025-05-19 6:18 UTC (permalink / raw)
To: Pierrick Bouvier
Cc: qemu-devel, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Peter Maydell
Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
> From: Philippe Mathieu-Daudé <philmd@linaro.org>
>
> We'd like to have some unified QAPI schema. Having a structure field
> conditional to a target being built in is not very practical.
>
> While @deprecated-props is only used by s390x target, it is generic
> enough and could be used by other targets (assuming we expand
> CpuModelExpansionType enum values).
>
> Let's always include this field, regardless of the target, but
> make it optional.
Let's add:
This is not a compatibility break only because the field remains
present always on S390x.
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> ---
> qapi/machine-target.json | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/qapi/machine-target.json b/qapi/machine-target.json
> index 426ce4ee82d..e153291a7fc 100644
> --- a/qapi/machine-target.json
> +++ b/qapi/machine-target.json
> @@ -244,19 +244,18 @@
> #
> # @model: the expanded CpuModelInfo.
> #
> -# @deprecated-props: a list of properties that are flagged as
> +# @deprecated-props: an optional list of properties that are flagged as
> # deprecated by the CPU vendor. The list depends on the
> # CpuModelExpansionType: "static" properties are a subset of the
> # enabled-properties for the expanded model; "full" properties are
> # a set of properties that are deprecated across all models for
> -# the architecture. (since: 9.1).
> +# the architecture. (since: 10.1 -- since 9.1 on s390x --).
> #
> # Since: 2.8
> ##
> { 'struct': 'CpuModelExpansionInfo',
> 'data': { 'model': 'CpuModelInfo',
> - 'deprecated-props' : { 'type': ['str'],
> - 'if': 'TARGET_S390X' } },
> + '*deprecated-props' : { 'type': ['str'] } },
[Copied from review of prior posts]
Make this
'*deprecated-props' : ['str'] },
please.
When I see "optional array", I wonder about the difference between
"absent" and "present and empty". The doc comment doesn't quite explain
it. I figure "present and empty" means empty, while "absent" means we
don't know / not implemented.
Is the difference useful?
Daniel doubts it is.
Philippe is happy to implement either variant.
> 'if': { 'any': [ 'TARGET_S390X',
> 'TARGET_I386',
> 'TARGET_ARM',
Note the patch doesn't touch any of the qmp_query_cpu_model_expansion().
The S390x version continues to set @deprecated_props always. The others
continue not to set it.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH v2 08/12] qapi: Make CpuModelExpansionInfo::deprecated-props optional and generic
2025-05-19 6:18 ` Markus Armbruster
@ 2025-05-21 19:22 ` Pierrick Bouvier
0 siblings, 0 replies; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-21 19:22 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Peter Maydell
On 5/18/25 11:18 PM, Markus Armbruster wrote:
> Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
>
>> From: Philippe Mathieu-Daudé <philmd@linaro.org>
>>
>> We'd like to have some unified QAPI schema. Having a structure field
>> conditional to a target being built in is not very practical.
>>
>> While @deprecated-props is only used by s390x target, it is generic
>> enough and could be used by other targets (assuming we expand
>> CpuModelExpansionType enum values).
>>
>> Let's always include this field, regardless of the target, but
>> make it optional.
>
> Let's add:
>
> This is not a compatibility break only because the field remains
> present always on S390x.
>
>>
>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>> ---
>> qapi/machine-target.json | 7 +++----
>> 1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/qapi/machine-target.json b/qapi/machine-target.json
>> index 426ce4ee82d..e153291a7fc 100644
>> --- a/qapi/machine-target.json
>> +++ b/qapi/machine-target.json
>> @@ -244,19 +244,18 @@
>> #
>> # @model: the expanded CpuModelInfo.
>> #
>> -# @deprecated-props: a list of properties that are flagged as
>> +# @deprecated-props: an optional list of properties that are flagged as
>> # deprecated by the CPU vendor. The list depends on the
>> # CpuModelExpansionType: "static" properties are a subset of the
>> # enabled-properties for the expanded model; "full" properties are
>> # a set of properties that are deprecated across all models for
>> -# the architecture. (since: 9.1).
>> +# the architecture. (since: 10.1 -- since 9.1 on s390x --).
>> #
>> # Since: 2.8
>> ##
>> { 'struct': 'CpuModelExpansionInfo',
>> 'data': { 'model': 'CpuModelInfo',
>> - 'deprecated-props' : { 'type': ['str'],
>> - 'if': 'TARGET_S390X' } },
>> + '*deprecated-props' : { 'type': ['str'] } },
>
> [Copied from review of prior posts]
>
> Make this
>
> '*deprecated-props' : ['str'] },
>
> please.
>
> When I see "optional array", I wonder about the difference between
> "absent" and "present and empty". The doc comment doesn't quite explain
> it. I figure "present and empty" means empty, while "absent" means we
> don't know / not implemented.
>
> Is the difference useful?
>
> Daniel doubts it is.
>
> Philippe is happy to implement either variant.
>
>> 'if': { 'any': [ 'TARGET_S390X',
>> 'TARGET_I386',
>> 'TARGET_ARM',
>
> Note the patch doesn't touch any of the qmp_query_cpu_model_expansion().
> The S390x version continues to set @deprecated_props always. The others
> continue not to set it.
>
Changed to "'*deprecated-props' : ['str'] }", as requested.
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 09/12] qapi: make most CPU commands unconditionally available
2025-05-15 17:27 [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema Pierrick Bouvier
` (7 preceding siblings ...)
2025-05-15 17:27 ` [PATCH v2 08/12] qapi: Make CpuModelExpansionInfo::deprecated-props optional and generic Pierrick Bouvier
@ 2025-05-15 17:27 ` Pierrick Bouvier
2025-05-17 6:00 ` Markus Armbruster
2025-05-19 6:29 ` Markus Armbruster
2025-05-15 17:27 ` [PATCH v2 10/12] qapi: make s390x specific " Pierrick Bouvier
` (3 subsequent siblings)
12 siblings, 2 replies; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Markus Armbruster, Peter Maydell
From: Daniel P. Berrangé <berrange@redhat.com>
This removes the TARGET_* conditions from all the CPU commands
that are conceptually target independent. Top level stubs are
provided to cope with targets which do not currently implement
all of the commands.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
MAINTAINERS | 1 -
qapi/machine-target.json | 522 --------------------------
qapi/machine.json | 363 ++++++++++++++++++
stubs/monitor-cpu-s390x.c | 23 ++
stubs/monitor-cpu.c | 21 ++
target/arm/arm-qmp-cmds.c | 2 +-
target/i386/cpu-system.c | 2 +-
target/i386/cpu.c | 2 +-
target/loongarch/loongarch-qmp-cmds.c | 2 +-
target/mips/system/mips-qmp-cmds.c | 12 +-
target/ppc/ppc-qmp-cmds.c | 12 +-
target/riscv/riscv-qmp-cmds.c | 2 +-
target/s390x/cpu_models_system.c | 2 +-
stubs/meson.build | 2 +
14 files changed, 437 insertions(+), 531 deletions(-)
delete mode 100644 qapi/machine-target.json
create mode 100644 stubs/monitor-cpu-s390x.c
create mode 100644 stubs/monitor-cpu.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 476dcb46683..c2a6e6d1c1c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1927,7 +1927,6 @@ F: hw/core/numa.c
F: hw/cpu/cluster.c
F: qapi/machine.json
F: qapi/machine-common.json
-F: qapi/machine-target.json
F: include/hw/boards.h
F: include/hw/core/cpu.h
F: include/hw/cpu/cluster.h
diff --git a/qapi/machine-target.json b/qapi/machine-target.json
deleted file mode 100644
index e153291a7fc..00000000000
--- a/qapi/machine-target.json
+++ /dev/null
@@ -1,522 +0,0 @@
-# -*- Mode: Python -*-
-# vim: filetype=python
-#
-# This work is licensed under the terms of the GNU GPL, version 2 or later.
-# See the COPYING file in the top-level directory.
-
-{ 'include': 'machine-common.json' }
-
-##
-# @CpuModelInfo:
-#
-# Virtual CPU model.
-#
-# A CPU model consists of the name of a CPU definition, to which delta
-# changes are applied (e.g. features added/removed). Most magic
-# values that an architecture might require should be hidden behind
-# the name. However, if required, architectures can expose relevant
-# properties.
-#
-# @name: the name of the CPU definition the model is based on
-#
-# @props: a dictionary of QOM properties to be applied
-#
-# Since: 2.8
-##
-{ 'struct': 'CpuModelInfo',
- 'data': { 'name': 'str',
- '*props': 'any' } }
-
-##
-# @CpuModelExpansionType:
-#
-# An enumeration of CPU model expansion types.
-#
-# @static: Expand to a static CPU model, a combination of a static
-# base model name and property delta changes. As the static base
-# model will never change, the expanded CPU model will be the
-# same, independent of QEMU version, machine type, machine
-# options, and accelerator options. Therefore, the resulting
-# model can be used by tooling without having to specify a
-# compatibility machine - e.g. when displaying the "host" model.
-# The @static CPU models are migration-safe.
-#
-# @full: Expand all properties. The produced model is not guaranteed
-# to be migration-safe, but allows tooling to get an insight and
-# work with model details.
-#
-# .. note:: When a non-migration-safe CPU model is expanded in static
-# mode, some features enabled by the CPU model may be omitted,
-# because they can't be implemented by a static CPU model
-# definition (e.g. cache info passthrough and PMU passthrough in
-# x86). If you need an accurate representation of the features
-# enabled by a non-migration-safe CPU model, use @full. If you
-# need a static representation that will keep ABI compatibility
-# even when changing QEMU version or machine-type, use @static (but
-# keep in mind that some features may be omitted).
-#
-# Since: 2.8
-##
-{ 'enum': 'CpuModelExpansionType',
- 'data': [ 'static', 'full' ] }
-
-##
-# @CpuModelCompareResult:
-#
-# An enumeration of CPU model comparison results. The result is
-# usually calculated using e.g. CPU features or CPU generations.
-#
-# @incompatible: If model A is incompatible to model B, model A is not
-# guaranteed to run where model B runs and the other way around.
-#
-# @identical: If model A is identical to model B, model A is
-# guaranteed to run where model B runs and the other way around.
-#
-# @superset: If model A is a superset of model B, model B is
-# guaranteed to run where model A runs. There are no guarantees
-# about the other way.
-#
-# @subset: If model A is a subset of model B, model A is guaranteed to
-# run where model B runs. There are no guarantees about the other
-# way.
-#
-# Since: 2.8
-##
-{ 'enum': 'CpuModelCompareResult',
- 'data': [ 'incompatible', 'identical', 'superset', 'subset' ] }
-
-##
-# @CpuModelBaselineInfo:
-#
-# The result of a CPU model baseline.
-#
-# @model: the baselined CpuModelInfo.
-#
-# Since: 2.8
-##
-{ 'struct': 'CpuModelBaselineInfo',
- 'data': { 'model': 'CpuModelInfo' },
- 'if': 'TARGET_S390X' }
-
-##
-# @CpuModelCompareInfo:
-#
-# The result of a CPU model comparison.
-#
-# @result: The result of the compare operation.
-#
-# @responsible-properties: List of properties that led to the
-# comparison result not being identical.
-#
-# @responsible-properties is a list of QOM property names that led to
-# both CPUs not being detected as identical. For identical models,
-# this list is empty. If a QOM property is read-only, that means
-# there's no known way to make the CPU models identical. If the
-# special property name "type" is included, the models are by
-# definition not identical and cannot be made identical.
-#
-# Since: 2.8
-##
-{ 'struct': 'CpuModelCompareInfo',
- 'data': { 'result': 'CpuModelCompareResult',
- 'responsible-properties': ['str'] },
- 'if': 'TARGET_S390X' }
-
-##
-# @query-cpu-model-comparison:
-#
-# Compares two CPU models, @modela and @modelb, returning how they
-# compare in a specific configuration. The results indicates how
-# both models compare regarding runnability. This result can be
-# used by tooling to make decisions if a certain CPU model will
-# run in a certain configuration or if a compatible CPU model has
-# to be created by baselining.
-#
-# Usually, a CPU model is compared against the maximum possible CPU
-# model of a certain configuration (e.g. the "host" model for KVM).
-# If that CPU model is identical or a subset, it will run in that
-# configuration.
-#
-# The result returned by this command may be affected by:
-#
-# * QEMU version: CPU models may look different depending on the QEMU
-# version. (Except for CPU models reported as "static" in
-# query-cpu-definitions.)
-# * machine-type: CPU model may look different depending on the
-# machine-type. (Except for CPU models reported as "static" in
-# query-cpu-definitions.)
-# * machine options (including accelerator): in some architectures,
-# CPU models may look different depending on machine and accelerator
-# options. (Except for CPU models reported as "static" in
-# query-cpu-definitions.)
-# * "-cpu" arguments and global properties: arguments to the -cpu
-# option and global properties may affect expansion of CPU models.
-# Using query-cpu-model-expansion while using these is not advised.
-#
-# Some architectures may not support comparing CPU models. s390x
-# supports comparing CPU models.
-#
-# @modela: description of the first CPU model to compare, referred to
-# as "model A" in CpuModelCompareResult
-#
-# @modelb: description of the second CPU model to compare, referred to
-# as "model B" in CpuModelCompareResult
-#
-# Returns: a CpuModelCompareInfo describing how both CPU models
-# compare
-#
-# Errors:
-# - if comparing CPU models is not supported
-# - if a model cannot be used
-# - if a model contains an unknown cpu definition name, unknown
-# properties or properties with wrong types.
-#
-# .. note:: This command isn't specific to s390x, but is only
-# implemented on this architecture currently.
-#
-# Since: 2.8
-##
-{ 'command': 'query-cpu-model-comparison',
- 'data': { 'modela': 'CpuModelInfo', 'modelb': 'CpuModelInfo' },
- 'returns': 'CpuModelCompareInfo',
- 'if': 'TARGET_S390X' }
-
-##
-# @query-cpu-model-baseline:
-#
-# Baseline two CPU models, @modela and @modelb, creating a compatible
-# third model. The created model will always be a static,
-# migration-safe CPU model (see "static" CPU model expansion for
-# details).
-#
-# This interface can be used by tooling to create a compatible CPU
-# model out two CPU models. The created CPU model will be identical
-# to or a subset of both CPU models when comparing them. Therefore,
-# the created CPU model is guaranteed to run where the given CPU
-# models run.
-#
-# The result returned by this command may be affected by:
-#
-# * QEMU version: CPU models may look different depending on the QEMU
-# version. (Except for CPU models reported as "static" in
-# query-cpu-definitions.)
-# * machine-type: CPU model may look different depending on the
-# machine-type. (Except for CPU models reported as "static" in
-# query-cpu-definitions.)
-# * machine options (including accelerator): in some architectures,
-# CPU models may look different depending on machine and accelerator
-# options. (Except for CPU models reported as "static" in
-# query-cpu-definitions.)
-# * "-cpu" arguments and global properties: arguments to the -cpu
-# option and global properties may affect expansion of CPU models.
-# Using query-cpu-model-expansion while using these is not advised.
-#
-# Some architectures may not support baselining CPU models. s390x
-# supports baselining CPU models.
-#
-# @modela: description of the first CPU model to baseline
-#
-# @modelb: description of the second CPU model to baseline
-#
-# Returns: a CpuModelBaselineInfo describing the baselined CPU model
-#
-# Errors:
-# - if baselining CPU models is not supported
-# - if a model cannot be used
-# - if a model contains an unknown cpu definition name, unknown
-# properties or properties with wrong types.
-#
-# .. note:: This command isn't specific to s390x, but is only
-# implemented on this architecture currently.
-#
-# Since: 2.8
-##
-{ 'command': 'query-cpu-model-baseline',
- 'data': { 'modela': 'CpuModelInfo',
- 'modelb': 'CpuModelInfo' },
- 'returns': 'CpuModelBaselineInfo',
- 'if': 'TARGET_S390X' }
-
-##
-# @CpuModelExpansionInfo:
-#
-# The result of a cpu model expansion.
-#
-# @model: the expanded CpuModelInfo.
-#
-# @deprecated-props: an optional list of properties that are flagged as
-# deprecated by the CPU vendor. The list depends on the
-# CpuModelExpansionType: "static" properties are a subset of the
-# enabled-properties for the expanded model; "full" properties are
-# a set of properties that are deprecated across all models for
-# the architecture. (since: 10.1 -- since 9.1 on s390x --).
-#
-# Since: 2.8
-##
-{ 'struct': 'CpuModelExpansionInfo',
- 'data': { 'model': 'CpuModelInfo',
- '*deprecated-props' : { 'type': ['str'] } },
- 'if': { 'any': [ 'TARGET_S390X',
- 'TARGET_I386',
- 'TARGET_ARM',
- 'TARGET_LOONGARCH64',
- 'TARGET_RISCV' ] } }
-
-##
-# @query-cpu-model-expansion:
-#
-# Expands a given CPU model, @model, (or a combination of CPU model +
-# additional options) to different granularities, specified by @type,
-# allowing tooling to get an understanding what a specific CPU model
-# looks like in QEMU under a certain configuration.
-#
-# This interface can be used to query the "host" CPU model.
-#
-# The data returned by this command may be affected by:
-#
-# * QEMU version: CPU models may look different depending on the QEMU
-# version. (Except for CPU models reported as "static" in
-# query-cpu-definitions.)
-# * machine-type: CPU model may look different depending on the
-# machine-type. (Except for CPU models reported as "static" in
-# query-cpu-definitions.)
-# * machine options (including accelerator): in some architectures,
-# CPU models may look different depending on machine and accelerator
-# options. (Except for CPU models reported as "static" in
-# query-cpu-definitions.)
-# * "-cpu" arguments and global properties: arguments to the -cpu
-# option and global properties may affect expansion of CPU models.
-# Using query-cpu-model-expansion while using these is not advised.
-#
-# Some architectures may not support all expansion types. s390x
-# supports "full" and "static". Arm only supports "full".
-#
-# @model: description of the CPU model to expand
-#
-# @type: expansion type, specifying how to expand the CPU model
-#
-# Returns: a CpuModelExpansionInfo describing the expanded CPU model
-#
-# Errors:
-# - if expanding CPU models is not supported
-# - if the model cannot be expanded
-# - if the model contains an unknown CPU definition name, unknown
-# properties or properties with a wrong type
-# - if an expansion type is not supported
-#
-# Since: 2.8
-##
-{ 'command': 'query-cpu-model-expansion',
- 'data': { 'type': 'CpuModelExpansionType',
- 'model': 'CpuModelInfo' },
- 'returns': 'CpuModelExpansionInfo',
- 'if': { 'any': [ 'TARGET_S390X',
- 'TARGET_I386',
- 'TARGET_ARM',
- 'TARGET_LOONGARCH64',
- 'TARGET_RISCV' ] } }
-
-##
-# @CpuDefinitionInfo:
-#
-# Virtual CPU definition.
-#
-# @name: the name of the CPU definition
-#
-# @migration-safe: whether a CPU definition can be safely used for
-# migration in combination with a QEMU compatibility machine when
-# migrating between different QEMU versions and between hosts with
-# different sets of (hardware or software) capabilities. If not
-# provided, information is not available and callers should not
-# assume the CPU definition to be migration-safe. (since 2.8)
-#
-# @static: whether a CPU definition is static and will not change
-# depending on QEMU version, machine type, machine options and
-# accelerator options. A static model is always migration-safe.
-# (since 2.8)
-#
-# @unavailable-features: List of properties that prevent the CPU model
-# from running in the current host. (since 2.8)
-#
-# @typename: Type name that can be used as argument to
-# @device-list-properties, to introspect properties configurable
-# using -cpu or -global. (since 2.9)
-#
-# @alias-of: Name of CPU model this model is an alias for. The target
-# of the CPU model alias may change depending on the machine type.
-# Management software is supposed to translate CPU model aliases
-# in the VM configuration, because aliases may stop being
-# migration-safe in the future (since 4.1)
-#
-# @deprecated: If true, this CPU model is deprecated and may be
-# removed in some future version of QEMU according to the QEMU
-# deprecation policy. (since 5.2)
-#
-# @unavailable-features is a list of QOM property names that represent
-# CPU model attributes that prevent the CPU from running. If the QOM
-# property is read-only, that means there's no known way to make the
-# CPU model run in the current host. Implementations that choose not
-# to provide specific information return the property name "type". If
-# the property is read-write, it means that it MAY be possible to run
-# the CPU model in the current host if that property is changed.
-# Management software can use it as hints to suggest or choose an
-# alternative for the user, or just to generate meaningful error
-# messages explaining why the CPU model can't be used. If
-# @unavailable-features is an empty list, the CPU model is runnable
-# using the current host and machine-type. If @unavailable-features
-# is not present, runnability information for the CPU is not
-# available.
-#
-# Since: 1.2
-##
-{ 'struct': 'CpuDefinitionInfo',
- 'data': { 'name': 'str',
- '*migration-safe': 'bool',
- 'static': 'bool',
- '*unavailable-features': [ 'str' ],
- 'typename': 'str',
- '*alias-of' : 'str',
- 'deprecated' : 'bool' },
- 'if': { 'any': [ 'TARGET_PPC',
- 'TARGET_ARM',
- 'TARGET_I386',
- 'TARGET_S390X',
- 'TARGET_MIPS',
- 'TARGET_LOONGARCH64',
- 'TARGET_RISCV' ] } }
-
-##
-# @query-cpu-definitions:
-#
-# Return a list of supported virtual CPU definitions
-#
-# Returns: a list of CpuDefinitionInfo
-#
-# Since: 1.2
-##
-{ 'command': 'query-cpu-definitions', 'returns': ['CpuDefinitionInfo'],
- 'if': { 'any': [ 'TARGET_PPC',
- 'TARGET_ARM',
- 'TARGET_I386',
- 'TARGET_S390X',
- 'TARGET_MIPS',
- 'TARGET_LOONGARCH64',
- 'TARGET_RISCV' ] } }
-
-##
-# @S390CpuPolarization:
-#
-# An enumeration of CPU polarization that can be assumed by a virtual
-# S390 CPU
-#
-# Since: 8.2
-##
-{ 'enum': 'S390CpuPolarization',
- 'data': [ 'horizontal', 'vertical' ],
- 'if': 'TARGET_S390X'
-}
-
-##
-# @set-cpu-topology:
-#
-# Modify the topology by moving the CPU inside the topology tree, or
-# by changing a modifier attribute of a CPU. Absent values will not
-# be modified.
-#
-# @core-id: the vCPU ID to be moved
-#
-# @socket-id: destination socket to move the vCPU to
-#
-# @book-id: destination book to move the vCPU to
-#
-# @drawer-id: destination drawer to move the vCPU to
-#
-# @entitlement: entitlement to set
-#
-# @dedicated: whether the provisioning of real to virtual CPU is
-# dedicated
-#
-# Features:
-#
-# @unstable: This command is experimental.
-#
-# Since: 8.2
-##
-{ 'command': 'set-cpu-topology',
- 'data': {
- 'core-id': 'uint16',
- '*socket-id': 'uint16',
- '*book-id': 'uint16',
- '*drawer-id': 'uint16',
- '*entitlement': 'S390CpuEntitlement',
- '*dedicated': 'bool'
- },
- 'features': [ 'unstable' ],
- 'if': { 'all': [ 'TARGET_S390X' , 'CONFIG_KVM' ] }
-}
-
-##
-# @CPU_POLARIZATION_CHANGE:
-#
-# Emitted when the guest asks to change the polarization.
-#
-# The guest can tell the host (via the PTF instruction) whether the
-# CPUs should be provisioned using horizontal or vertical
-# polarization.
-#
-# On horizontal polarization the host is expected to provision all
-# vCPUs equally.
-#
-# On vertical polarization the host can provision each vCPU
-# differently. The guest will get information on the details of the
-# provisioning the next time it uses the STSI(15) instruction.
-#
-# @polarization: polarization specified by the guest
-#
-# Features:
-#
-# @unstable: This event is experimental.
-#
-# Since: 8.2
-#
-# .. qmp-example::
-#
-# <- { "event": "CPU_POLARIZATION_CHANGE",
-# "data": { "polarization": "horizontal" },
-# "timestamp": { "seconds": 1401385907, "microseconds": 422329 } }
-##
-{ 'event': 'CPU_POLARIZATION_CHANGE',
- 'data': { 'polarization': 'S390CpuPolarization' },
- 'features': [ 'unstable' ],
- 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] }
-}
-
-##
-# @CpuPolarizationInfo:
-#
-# The result of a CPU polarization query.
-#
-# @polarization: the CPU polarization
-#
-# Since: 8.2
-##
-{ 'struct': 'CpuPolarizationInfo',
- 'data': { 'polarization': 'S390CpuPolarization' },
- 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] }
-}
-
-##
-# @query-s390x-cpu-polarization:
-#
-# Features:
-#
-# @unstable: This command is experimental.
-#
-# Returns: the machine's CPU polarization
-#
-# Since: 8.2
-##
-{ 'command': 'query-s390x-cpu-polarization', 'returns': 'CpuPolarizationInfo',
- 'features': [ 'unstable' ],
- 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] }
-}
diff --git a/qapi/machine.json b/qapi/machine.json
index c8feb9fe17b..a357604e6d1 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -1916,3 +1916,366 @@
##
{ 'command': 'dump-skeys',
'data': { 'filename': 'str' } }
+
+##
+# @CpuModelInfo:
+#
+# Virtual CPU model.
+#
+# A CPU model consists of the name of a CPU definition, to which delta
+# changes are applied (e.g. features added/removed). Most magic
+# values that an architecture might require should be hidden behind
+# the name. However, if required, architectures can expose relevant
+# properties.
+#
+# @name: the name of the CPU definition the model is based on
+#
+# @props: a dictionary of QOM properties to be applied
+#
+# Since: 2.8
+##
+{ 'struct': 'CpuModelInfo',
+ 'data': { 'name': 'str',
+ '*props': 'any' } }
+
+##
+# @CpuModelExpansionType:
+#
+# An enumeration of CPU model expansion types.
+#
+# @static: Expand to a static CPU model, a combination of a static
+# base model name and property delta changes. As the static base
+# model will never change, the expanded CPU model will be the
+# same, independent of QEMU version, machine type, machine
+# options, and accelerator options. Therefore, the resulting
+# model can be used by tooling without having to specify a
+# compatibility machine - e.g. when displaying the "host" model.
+# The @static CPU models are migration-safe.
+#
+# @full: Expand all properties. The produced model is not guaranteed
+# to be migration-safe, but allows tooling to get an insight and
+# work with model details.
+#
+# .. note:: When a non-migration-safe CPU model is expanded in static
+# mode, some features enabled by the CPU model may be omitted,
+# because they can't be implemented by a static CPU model
+# definition (e.g. cache info passthrough and PMU passthrough in
+# x86). If you need an accurate representation of the features
+# enabled by a non-migration-safe CPU model, use @full. If you
+# need a static representation that will keep ABI compatibility
+# even when changing QEMU version or machine-type, use @static (but
+# keep in mind that some features may be omitted).
+#
+# Since: 2.8
+##
+{ 'enum': 'CpuModelExpansionType',
+ 'data': [ 'static', 'full' ] }
+
+##
+# @CpuModelCompareResult:
+#
+# An enumeration of CPU model comparison results. The result is
+# usually calculated using e.g. CPU features or CPU generations.
+#
+# @incompatible: If model A is incompatible to model B, model A is not
+# guaranteed to run where model B runs and the other way around.
+#
+# @identical: If model A is identical to model B, model A is
+# guaranteed to run where model B runs and the other way around.
+#
+# @superset: If model A is a superset of model B, model B is
+# guaranteed to run where model A runs. There are no guarantees
+# about the other way.
+#
+# @subset: If model A is a subset of model B, model A is guaranteed to
+# run where model B runs. There are no guarantees about the other
+# way.
+#
+# Since: 2.8
+##
+{ 'enum': 'CpuModelCompareResult',
+ 'data': [ 'incompatible', 'identical', 'superset', 'subset' ] }
+
+##
+# @CpuModelBaselineInfo:
+#
+# The result of a CPU model baseline.
+#
+# @model: the baselined CpuModelInfo.
+#
+# Since: 2.8
+##
+{ 'struct': 'CpuModelBaselineInfo',
+ 'data': { 'model': 'CpuModelInfo' } }
+
+##
+# @CpuModelCompareInfo:
+#
+# The result of a CPU model comparison.
+#
+# @result: The result of the compare operation.
+#
+# @responsible-properties: List of properties that led to the
+# comparison result not being identical.
+#
+# @responsible-properties is a list of QOM property names that led to
+# both CPUs not being detected as identical. For identical models,
+# this list is empty. If a QOM property is read-only, that means
+# there's no known way to make the CPU models identical. If the
+# special property name "type" is included, the models are by
+# definition not identical and cannot be made identical.
+#
+# Since: 2.8
+##
+{ 'struct': 'CpuModelCompareInfo',
+ 'data': { 'result': 'CpuModelCompareResult',
+ 'responsible-properties': ['str'] } }
+
+##
+# @query-cpu-model-comparison:
+#
+# Compares two CPU models, @modela and @modelb, returning how they
+# compare in a specific configuration. The results indicates how
+# both models compare regarding runnability. This result can be
+# used by tooling to make decisions if a certain CPU model will
+# run in a certain configuration or if a compatible CPU model has
+# to be created by baselining.
+#
+# Usually, a CPU model is compared against the maximum possible CPU
+# model of a certain configuration (e.g. the "host" model for KVM).
+# If that CPU model is identical or a subset, it will run in that
+# configuration.
+#
+# The result returned by this command may be affected by:
+#
+# * QEMU version: CPU models may look different depending on the QEMU
+# version. (Except for CPU models reported as "static" in
+# query-cpu-definitions.)
+# * machine-type: CPU model may look different depending on the
+# machine-type. (Except for CPU models reported as "static" in
+# query-cpu-definitions.)
+# * machine options (including accelerator): in some architectures,
+# CPU models may look different depending on machine and accelerator
+# options. (Except for CPU models reported as "static" in
+# query-cpu-definitions.)
+# * "-cpu" arguments and global properties: arguments to the -cpu
+# option and global properties may affect expansion of CPU models.
+# Using query-cpu-model-expansion while using these is not advised.
+#
+# Some architectures may not support comparing CPU models. s390x
+# supports comparing CPU models.
+#
+# @modela: description of the first CPU model to compare, referred to
+# as "model A" in CpuModelCompareResult
+#
+# @modelb: description of the second CPU model to compare, referred to
+# as "model B" in CpuModelCompareResult
+#
+# Returns: a CpuModelCompareInfo describing how both CPU models
+# compare
+#
+# Errors:
+# - if comparing CPU models is not supported by the target
+# - if a model cannot be used
+# - if a model contains an unknown cpu definition name, unknown
+# properties or properties with wrong types.
+#
+# Since: 2.8
+##
+{ 'command': 'query-cpu-model-comparison',
+ 'data': { 'modela': 'CpuModelInfo', 'modelb': 'CpuModelInfo' },
+ 'returns': 'CpuModelCompareInfo' }
+
+##
+# @query-cpu-model-baseline:
+#
+# Baseline two CPU models, @modela and @modelb, creating a compatible
+# third model. The created model will always be a static,
+# migration-safe CPU model (see "static" CPU model expansion for
+# details).
+#
+# This interface can be used by tooling to create a compatible CPU
+# model out two CPU models. The created CPU model will be identical
+# to or a subset of both CPU models when comparing them. Therefore,
+# the created CPU model is guaranteed to run where the given CPU
+# models run.
+#
+# The result returned by this command may be affected by:
+#
+# * QEMU version: CPU models may look different depending on the QEMU
+# version. (Except for CPU models reported as "static" in
+# query-cpu-definitions.)
+# * machine-type: CPU model may look different depending on the
+# machine-type. (Except for CPU models reported as "static" in
+# query-cpu-definitions.)
+# * machine options (including accelerator): in some architectures,
+# CPU models may look different depending on machine and accelerator
+# options. (Except for CPU models reported as "static" in
+# query-cpu-definitions.)
+# * "-cpu" arguments and global properties: arguments to the -cpu
+# option and global properties may affect expansion of CPU models.
+# Using query-cpu-model-expansion while using these is not advised.
+#
+# Some architectures may not support baselining CPU models. s390x
+# supports baselining CPU models.
+#
+# @modela: description of the first CPU model to baseline
+#
+# @modelb: description of the second CPU model to baseline
+#
+# Returns: a CpuModelBaselineInfo describing the baselined CPU model
+#
+# Errors:
+# - if baselining CPU models is not supported by the target
+# - if a model cannot be used
+# - if a model contains an unknown cpu definition name, unknown
+# properties or properties with wrong types.
+#
+# Since: 2.8
+##
+{ 'command': 'query-cpu-model-baseline',
+ 'data': { 'modela': 'CpuModelInfo',
+ 'modelb': 'CpuModelInfo' },
+ 'returns': 'CpuModelBaselineInfo' }
+
+##
+# @CpuModelExpansionInfo:
+#
+# The result of a cpu model expansion.
+#
+# @model: the expanded CpuModelInfo.
+#
+# @deprecated-props: an optional list of properties that are flagged as
+# deprecated by the CPU vendor. The list depends on the
+# CpuModelExpansionType: "static" properties are a subset of the
+# enabled-properties for the expanded model; "full" properties are
+# a set of properties that are deprecated across all models for
+# the architecture. (since: 10.1 -- since 9.1 on s390x --).
+#
+# Since: 2.8
+##
+{ 'struct': 'CpuModelExpansionInfo',
+ 'data': { 'model': 'CpuModelInfo',
+ '*deprecated-props' : { 'type': ['str'] } } }
+
+##
+# @query-cpu-model-expansion:
+#
+# Expands a given CPU model, @model, (or a combination of CPU model +
+# additional options) to different granularities, specified by @type,
+# allowing tooling to get an understanding what a specific CPU model
+# looks like in QEMU under a certain configuration.
+#
+# This interface can be used to query the "host" CPU model.
+#
+# The data returned by this command may be affected by:
+#
+# * QEMU version: CPU models may look different depending on the QEMU
+# version. (Except for CPU models reported as "static" in
+# query-cpu-definitions.)
+# * machine-type: CPU model may look different depending on the
+# machine-type. (Except for CPU models reported as "static" in
+# query-cpu-definitions.)
+# * machine options (including accelerator): in some architectures,
+# CPU models may look different depending on machine and accelerator
+# options. (Except for CPU models reported as "static" in
+# query-cpu-definitions.)
+# * "-cpu" arguments and global properties: arguments to the -cpu
+# option and global properties may affect expansion of CPU models.
+# Using query-cpu-model-expansion while using these is not advised.
+#
+# Some architectures may not support all expansion types. s390x
+# supports "full" and "static". Arm only supports "full".
+#
+# @model: description of the CPU model to expand
+#
+# @type: expansion type, specifying how to expand the CPU model
+#
+# Returns: a CpuModelExpansionInfo describing the expanded CPU model
+#
+# Errors:
+# - if expanding CPU models is not supported
+# - if the model cannot be expanded
+# - if the model contains an unknown CPU definition name, unknown
+# properties or properties with a wrong type
+# - if an expansion type is not supported
+#
+# Since: 2.8
+##
+{ 'command': 'query-cpu-model-expansion',
+ 'data': { 'type': 'CpuModelExpansionType',
+ 'model': 'CpuModelInfo' },
+ 'returns': 'CpuModelExpansionInfo' }
+
+##
+# @CpuDefinitionInfo:
+#
+# Virtual CPU definition.
+#
+# @name: the name of the CPU definition
+#
+# @migration-safe: whether a CPU definition can be safely used for
+# migration in combination with a QEMU compatibility machine when
+# migrating between different QEMU versions and between hosts with
+# different sets of (hardware or software) capabilities. If not
+# provided, information is not available and callers should not
+# assume the CPU definition to be migration-safe. (since 2.8)
+#
+# @static: whether a CPU definition is static and will not change
+# depending on QEMU version, machine type, machine options and
+# accelerator options. A static model is always migration-safe.
+# (since 2.8)
+#
+# @unavailable-features: List of properties that prevent the CPU model
+# from running in the current host. (since 2.8)
+#
+# @typename: Type name that can be used as argument to
+# @device-list-properties, to introspect properties configurable
+# using -cpu or -global. (since 2.9)
+#
+# @alias-of: Name of CPU model this model is an alias for. The target
+# of the CPU model alias may change depending on the machine type.
+# Management software is supposed to translate CPU model aliases
+# in the VM configuration, because aliases may stop being
+# migration-safe in the future (since 4.1)
+#
+# @deprecated: If true, this CPU model is deprecated and may be
+# removed in some future version of QEMU according to the QEMU
+# deprecation policy. (since 5.2)
+#
+# @unavailable-features is a list of QOM property names that represent
+# CPU model attributes that prevent the CPU from running. If the QOM
+# property is read-only, that means there's no known way to make the
+# CPU model run in the current host. Implementations that choose not
+# to provide specific information return the property name "type". If
+# the property is read-write, it means that it MAY be possible to run
+# the CPU model in the current host if that property is changed.
+# Management software can use it as hints to suggest or choose an
+# alternative for the user, or just to generate meaningful error
+# messages explaining why the CPU model can't be used. If
+# @unavailable-features is an empty list, the CPU model is runnable
+# using the current host and machine-type. If @unavailable-features
+# is not present, runnability information for the CPU is not
+# available.
+#
+# Since: 1.2
+##
+{ 'struct': 'CpuDefinitionInfo',
+ 'data': { 'name': 'str',
+ '*migration-safe': 'bool',
+ 'static': 'bool',
+ '*unavailable-features': [ 'str' ],
+ 'typename': 'str',
+ '*alias-of' : 'str',
+ 'deprecated' : 'bool' } }
+
+##
+# @query-cpu-definitions:
+#
+# Return a list of supported virtual CPU definitions
+#
+# Returns: a list of CpuDefinitionInfo
+#
+# Since: 1.2
+##
+{ 'command': 'query-cpu-definitions', 'returns': ['CpuDefinitionInfo'] }
diff --git a/stubs/monitor-cpu-s390x.c b/stubs/monitor-cpu-s390x.c
new file mode 100644
index 00000000000..71e794482b5
--- /dev/null
+++ b/stubs/monitor-cpu-s390x.c
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-machine.h"
+
+CpuModelCompareInfo *
+qmp_query_cpu_model_comparison(CpuModelInfo *infoa,
+ CpuModelInfo *infob,
+ Error **errp)
+{
+ error_setg(errp, "CPU model comparison is not supported on this target");
+ return NULL;
+}
+
+CpuModelBaselineInfo *
+qmp_query_cpu_model_baseline(CpuModelInfo *infoa,
+ CpuModelInfo *infob,
+ Error **errp)
+{
+ error_setg(errp, "CPU model baseline is not supported on this target");
+ return NULL;
+}
diff --git a/stubs/monitor-cpu.c b/stubs/monitor-cpu.c
new file mode 100644
index 00000000000..a8c7ee89b9d
--- /dev/null
+++ b/stubs/monitor-cpu.c
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-machine.h"
+
+CpuModelExpansionInfo *
+qmp_query_cpu_model_expansion(CpuModelExpansionType type,
+ CpuModelInfo *model,
+ Error **errp)
+{
+ error_setg(errp, "CPU model expansion is not supported on this target");
+ return NULL;
+}
+
+CpuDefinitionInfoList *
+qmp_query_cpu_definitions(Error **errp)
+{
+ error_setg(errp, "CPU model definitions are not supported on this target");
+ return NULL;
+}
diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c
index ef18c867ca4..cca6b9722b2 100644
--- a/target/arm/arm-qmp-cmds.c
+++ b/target/arm/arm-qmp-cmds.c
@@ -26,7 +26,7 @@
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "qapi/qobject-input-visitor.h"
-#include "qapi/qapi-commands-machine-target.h"
+#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-commands-misc-arm.h"
#include "qobject/qdict.h"
#include "qom/qom-qobject.h"
diff --git a/target/i386/cpu-system.c b/target/i386/cpu-system.c
index 55f192e8193..b1494aa6740 100644
--- a/target/i386/cpu-system.c
+++ b/target/i386/cpu-system.c
@@ -24,7 +24,7 @@
#include "qobject/qdict.h"
#include "qapi/qobject-input-visitor.h"
#include "qom/qom-qobject.h"
-#include "qapi/qapi-commands-machine-target.h"
+#include "qapi/qapi-commands-machine.h"
#include "cpu-internal.h"
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index ec908d7d360..91f89919487 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -38,7 +38,7 @@
#include "exec/watchpoint.h"
#ifndef CONFIG_USER_ONLY
#include "system/reset.h"
-#include "qapi/qapi-commands-machine-target.h"
+#include "qapi/qapi-commands-machine.h"
#include "system/address-spaces.h"
#include "hw/boards.h"
#include "hw/i386/sgx-epc.h"
diff --git a/target/loongarch/loongarch-qmp-cmds.c b/target/loongarch/loongarch-qmp-cmds.c
index 6f732d80f3f..f5f1cd0009d 100644
--- a/target/loongarch/loongarch-qmp-cmds.c
+++ b/target/loongarch/loongarch-qmp-cmds.c
@@ -8,7 +8,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-machine-target.h"
+#include "qapi/qapi-commands-machine.h"
#include "cpu.h"
#include "qobject/qdict.h"
#include "qapi/qobject-input-visitor.h"
diff --git a/target/mips/system/mips-qmp-cmds.c b/target/mips/system/mips-qmp-cmds.c
index 7340ac70ba0..d98d6623f2f 100644
--- a/target/mips/system/mips-qmp-cmds.c
+++ b/target/mips/system/mips-qmp-cmds.c
@@ -7,9 +7,19 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qapi-commands-machine-target.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-machine.h"
#include "cpu.h"
+CpuModelExpansionInfo *
+qmp_query_cpu_model_expansion(CpuModelExpansionType type,
+ CpuModelInfo *model,
+ Error **errp)
+{
+ error_setg(errp, "CPU model expansion is not supported on this target");
+ return NULL;
+}
+
static void mips_cpu_add_definition(gpointer data, gpointer user_data)
{
ObjectClass *oc = data;
diff --git a/target/ppc/ppc-qmp-cmds.c b/target/ppc/ppc-qmp-cmds.c
index a25d86a8d19..7022564604f 100644
--- a/target/ppc/ppc-qmp-cmds.c
+++ b/target/ppc/ppc-qmp-cmds.c
@@ -28,7 +28,8 @@
#include "qemu/ctype.h"
#include "monitor/hmp-target.h"
#include "monitor/hmp.h"
-#include "qapi/qapi-commands-machine-target.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-machine.h"
#include "cpu-models.h"
#include "cpu-qom.h"
@@ -175,6 +176,15 @@ int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval)
return -EINVAL;
}
+CpuModelExpansionInfo *
+qmp_query_cpu_model_expansion(CpuModelExpansionType type,
+ CpuModelInfo *model,
+ Error **errp)
+{
+ error_setg(errp, "CPU model expansion is not supported on this target");
+ return NULL;
+}
+
static void ppc_cpu_defs_entry(gpointer data, gpointer user_data)
{
ObjectClass *oc = data;
diff --git a/target/riscv/riscv-qmp-cmds.c b/target/riscv/riscv-qmp-cmds.c
index d0a324364dd..8ba8aa0d5f8 100644
--- a/target/riscv/riscv-qmp-cmds.c
+++ b/target/riscv/riscv-qmp-cmds.c
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-machine-target.h"
+#include "qapi/qapi-commands-machine.h"
#include "qobject/qbool.h"
#include "qobject/qdict.h"
#include "qapi/qobject-input-visitor.h"
diff --git a/target/s390x/cpu_models_system.c b/target/s390x/cpu_models_system.c
index 4351182f720..9d84faa3c9e 100644
--- a/target/s390x/cpu_models_system.c
+++ b/target/s390x/cpu_models_system.c
@@ -19,7 +19,7 @@
#include "qapi/visitor.h"
#include "qapi/qobject-input-visitor.h"
#include "qobject/qdict.h"
-#include "qapi/qapi-commands-machine-target.h"
+#include "qapi/qapi-commands-machine.h"
static void list_add_feat(const char *name, void *opaque);
diff --git a/stubs/meson.build b/stubs/meson.build
index 0ef11976a2f..3b2fad0824f 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -82,6 +82,8 @@ if have_system
stub_ss.add(files('monitor-i386-sev.c'))
stub_ss.add(files('monitor-i386-sgx.c'))
stub_ss.add(files('monitor-i386-xen.c'))
+ stub_ss.add(files('monitor-cpu.c'))
+ stub_ss.add(files('monitor-cpu-s390x.c'))
endif
if have_system or have_user
--
2.47.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH v2 09/12] qapi: make most CPU commands unconditionally available
2025-05-15 17:27 ` [PATCH v2 09/12] qapi: make most CPU commands unconditionally available Pierrick Bouvier
@ 2025-05-17 6:00 ` Markus Armbruster
2025-05-17 19:41 ` Pierrick Bouvier
2025-05-19 6:29 ` Markus Armbruster
1 sibling, 1 reply; 28+ messages in thread
From: Markus Armbruster @ 2025-05-17 6:00 UTC (permalink / raw)
To: Pierrick Bouvier
Cc: qemu-devel, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Peter Maydell
Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
> From: Daniel P. Berrangé <berrange@redhat.com>
>
> This removes the TARGET_* conditions from all the CPU commands
> that are conceptually target independent. Top level stubs are
> provided to cope with targets which do not currently implement
> all of the commands.
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> ---
> MAINTAINERS | 1 -
> qapi/machine-target.json | 522 --------------------------
> qapi/machine.json | 363 ++++++++++++++++++
> stubs/monitor-cpu-s390x.c | 23 ++
> stubs/monitor-cpu.c | 21 ++
> target/arm/arm-qmp-cmds.c | 2 +-
> target/i386/cpu-system.c | 2 +-
> target/i386/cpu.c | 2 +-
> target/loongarch/loongarch-qmp-cmds.c | 2 +-
> target/mips/system/mips-qmp-cmds.c | 12 +-
> target/ppc/ppc-qmp-cmds.c | 12 +-
> target/riscv/riscv-qmp-cmds.c | 2 +-
> target/s390x/cpu_models_system.c | 2 +-
> stubs/meson.build | 2 +
> 14 files changed, 437 insertions(+), 531 deletions(-)
> delete mode 100644 qapi/machine-target.json
> create mode 100644 stubs/monitor-cpu-s390x.c
> create mode 100644 stubs/monitor-cpu.c
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 476dcb46683..c2a6e6d1c1c 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1927,7 +1927,6 @@ F: hw/core/numa.c
> F: hw/cpu/cluster.c
> F: qapi/machine.json
> F: qapi/machine-common.json
> -F: qapi/machine-target.json
> F: include/hw/boards.h
> F: include/hw/core/cpu.h
> F: include/hw/cpu/cluster.h
This needs to be delayed; see below.
> diff --git a/qapi/machine-target.json b/qapi/machine-target.json
> deleted file mode 100644
> index e153291a7fc..00000000000
> --- a/qapi/machine-target.json
> +++ /dev/null
> @@ -1,522 +0,0 @@
> -# -*- Mode: Python -*-
> -# vim: filetype=python
> -#
> -# This work is licensed under the terms of the GNU GPL, version 2 or later.
> -# See the COPYING file in the top-level directory.
> -
> -{ 'include': 'machine-common.json' }
> -
> -##
> -# @CpuModelInfo:
> -#
> -# Virtual CPU model.
> -#
> -# A CPU model consists of the name of a CPU definition, to which delta
> -# changes are applied (e.g. features added/removed). Most magic
> -# values that an architecture might require should be hidden behind
> -# the name. However, if required, architectures can expose relevant
> -# properties.
> -#
> -# @name: the name of the CPU definition the model is based on
> -#
> -# @props: a dictionary of QOM properties to be applied
> -#
> -# Since: 2.8
> -##
> -{ 'struct': 'CpuModelInfo',
> - 'data': { 'name': 'str',
> - '*props': 'any' } }
> -
> -##
> -# @CpuModelExpansionType:
> -#
> -# An enumeration of CPU model expansion types.
> -#
> -# @static: Expand to a static CPU model, a combination of a static
> -# base model name and property delta changes. As the static base
> -# model will never change, the expanded CPU model will be the
> -# same, independent of QEMU version, machine type, machine
> -# options, and accelerator options. Therefore, the resulting
> -# model can be used by tooling without having to specify a
> -# compatibility machine - e.g. when displaying the "host" model.
> -# The @static CPU models are migration-safe.
> -#
> -# @full: Expand all properties. The produced model is not guaranteed
> -# to be migration-safe, but allows tooling to get an insight and
> -# work with model details.
> -#
> -# .. note:: When a non-migration-safe CPU model is expanded in static
> -# mode, some features enabled by the CPU model may be omitted,
> -# because they can't be implemented by a static CPU model
> -# definition (e.g. cache info passthrough and PMU passthrough in
> -# x86). If you need an accurate representation of the features
> -# enabled by a non-migration-safe CPU model, use @full. If you
> -# need a static representation that will keep ABI compatibility
> -# even when changing QEMU version or machine-type, use @static (but
> -# keep in mind that some features may be omitted).
> -#
> -# Since: 2.8
> -##
> -{ 'enum': 'CpuModelExpansionType',
> - 'data': [ 'static', 'full' ] }
> -
> -##
> -# @CpuModelCompareResult:
> -#
> -# An enumeration of CPU model comparison results. The result is
> -# usually calculated using e.g. CPU features or CPU generations.
> -#
> -# @incompatible: If model A is incompatible to model B, model A is not
> -# guaranteed to run where model B runs and the other way around.
> -#
> -# @identical: If model A is identical to model B, model A is
> -# guaranteed to run where model B runs and the other way around.
> -#
> -# @superset: If model A is a superset of model B, model B is
> -# guaranteed to run where model A runs. There are no guarantees
> -# about the other way.
> -#
> -# @subset: If model A is a subset of model B, model A is guaranteed to
> -# run where model B runs. There are no guarantees about the other
> -# way.
> -#
> -# Since: 2.8
> -##
> -{ 'enum': 'CpuModelCompareResult',
> - 'data': [ 'incompatible', 'identical', 'superset', 'subset' ] }
> -
> -##
> -# @CpuModelBaselineInfo:
> -#
> -# The result of a CPU model baseline.
> -#
> -# @model: the baselined CpuModelInfo.
> -#
> -# Since: 2.8
> -##
> -{ 'struct': 'CpuModelBaselineInfo',
> - 'data': { 'model': 'CpuModelInfo' },
> - 'if': 'TARGET_S390X' }
> -
> -##
> -# @CpuModelCompareInfo:
> -#
> -# The result of a CPU model comparison.
> -#
> -# @result: The result of the compare operation.
> -#
> -# @responsible-properties: List of properties that led to the
> -# comparison result not being identical.
> -#
> -# @responsible-properties is a list of QOM property names that led to
> -# both CPUs not being detected as identical. For identical models,
> -# this list is empty. If a QOM property is read-only, that means
> -# there's no known way to make the CPU models identical. If the
> -# special property name "type" is included, the models are by
> -# definition not identical and cannot be made identical.
> -#
> -# Since: 2.8
> -##
> -{ 'struct': 'CpuModelCompareInfo',
> - 'data': { 'result': 'CpuModelCompareResult',
> - 'responsible-properties': ['str'] },
> - 'if': 'TARGET_S390X' }
> -
> -##
> -# @query-cpu-model-comparison:
> -#
> -# Compares two CPU models, @modela and @modelb, returning how they
> -# compare in a specific configuration. The results indicates how
> -# both models compare regarding runnability. This result can be
> -# used by tooling to make decisions if a certain CPU model will
> -# run in a certain configuration or if a compatible CPU model has
> -# to be created by baselining.
> -#
> -# Usually, a CPU model is compared against the maximum possible CPU
> -# model of a certain configuration (e.g. the "host" model for KVM).
> -# If that CPU model is identical or a subset, it will run in that
> -# configuration.
> -#
> -# The result returned by this command may be affected by:
> -#
> -# * QEMU version: CPU models may look different depending on the QEMU
> -# version. (Except for CPU models reported as "static" in
> -# query-cpu-definitions.)
> -# * machine-type: CPU model may look different depending on the
> -# machine-type. (Except for CPU models reported as "static" in
> -# query-cpu-definitions.)
> -# * machine options (including accelerator): in some architectures,
> -# CPU models may look different depending on machine and accelerator
> -# options. (Except for CPU models reported as "static" in
> -# query-cpu-definitions.)
> -# * "-cpu" arguments and global properties: arguments to the -cpu
> -# option and global properties may affect expansion of CPU models.
> -# Using query-cpu-model-expansion while using these is not advised.
> -#
> -# Some architectures may not support comparing CPU models. s390x
> -# supports comparing CPU models.
> -#
> -# @modela: description of the first CPU model to compare, referred to
> -# as "model A" in CpuModelCompareResult
> -#
> -# @modelb: description of the second CPU model to compare, referred to
> -# as "model B" in CpuModelCompareResult
> -#
> -# Returns: a CpuModelCompareInfo describing how both CPU models
> -# compare
> -#
> -# Errors:
> -# - if comparing CPU models is not supported
> -# - if a model cannot be used
> -# - if a model contains an unknown cpu definition name, unknown
> -# properties or properties with wrong types.
> -#
> -# .. note:: This command isn't specific to s390x, but is only
> -# implemented on this architecture currently.
> -#
> -# Since: 2.8
> -##
> -{ 'command': 'query-cpu-model-comparison',
> - 'data': { 'modela': 'CpuModelInfo', 'modelb': 'CpuModelInfo' },
> - 'returns': 'CpuModelCompareInfo',
> - 'if': 'TARGET_S390X' }
> -
> -##
> -# @query-cpu-model-baseline:
> -#
> -# Baseline two CPU models, @modela and @modelb, creating a compatible
> -# third model. The created model will always be a static,
> -# migration-safe CPU model (see "static" CPU model expansion for
> -# details).
> -#
> -# This interface can be used by tooling to create a compatible CPU
> -# model out two CPU models. The created CPU model will be identical
> -# to or a subset of both CPU models when comparing them. Therefore,
> -# the created CPU model is guaranteed to run where the given CPU
> -# models run.
> -#
> -# The result returned by this command may be affected by:
> -#
> -# * QEMU version: CPU models may look different depending on the QEMU
> -# version. (Except for CPU models reported as "static" in
> -# query-cpu-definitions.)
> -# * machine-type: CPU model may look different depending on the
> -# machine-type. (Except for CPU models reported as "static" in
> -# query-cpu-definitions.)
> -# * machine options (including accelerator): in some architectures,
> -# CPU models may look different depending on machine and accelerator
> -# options. (Except for CPU models reported as "static" in
> -# query-cpu-definitions.)
> -# * "-cpu" arguments and global properties: arguments to the -cpu
> -# option and global properties may affect expansion of CPU models.
> -# Using query-cpu-model-expansion while using these is not advised.
> -#
> -# Some architectures may not support baselining CPU models. s390x
> -# supports baselining CPU models.
> -#
> -# @modela: description of the first CPU model to baseline
> -#
> -# @modelb: description of the second CPU model to baseline
> -#
> -# Returns: a CpuModelBaselineInfo describing the baselined CPU model
> -#
> -# Errors:
> -# - if baselining CPU models is not supported
> -# - if a model cannot be used
> -# - if a model contains an unknown cpu definition name, unknown
> -# properties or properties with wrong types.
> -#
> -# .. note:: This command isn't specific to s390x, but is only
> -# implemented on this architecture currently.
> -#
> -# Since: 2.8
> -##
> -{ 'command': 'query-cpu-model-baseline',
> - 'data': { 'modela': 'CpuModelInfo',
> - 'modelb': 'CpuModelInfo' },
> - 'returns': 'CpuModelBaselineInfo',
> - 'if': 'TARGET_S390X' }
> -
> -##
> -# @CpuModelExpansionInfo:
> -#
> -# The result of a cpu model expansion.
> -#
> -# @model: the expanded CpuModelInfo.
> -#
> -# @deprecated-props: an optional list of properties that are flagged as
> -# deprecated by the CPU vendor. The list depends on the
> -# CpuModelExpansionType: "static" properties are a subset of the
> -# enabled-properties for the expanded model; "full" properties are
> -# a set of properties that are deprecated across all models for
> -# the architecture. (since: 10.1 -- since 9.1 on s390x --).
> -#
> -# Since: 2.8
> -##
> -{ 'struct': 'CpuModelExpansionInfo',
> - 'data': { 'model': 'CpuModelInfo',
> - '*deprecated-props' : { 'type': ['str'] } },
> - 'if': { 'any': [ 'TARGET_S390X',
> - 'TARGET_I386',
> - 'TARGET_ARM',
> - 'TARGET_LOONGARCH64',
> - 'TARGET_RISCV' ] } }
> -
> -##
> -# @query-cpu-model-expansion:
> -#
> -# Expands a given CPU model, @model, (or a combination of CPU model +
> -# additional options) to different granularities, specified by @type,
> -# allowing tooling to get an understanding what a specific CPU model
> -# looks like in QEMU under a certain configuration.
> -#
> -# This interface can be used to query the "host" CPU model.
> -#
> -# The data returned by this command may be affected by:
> -#
> -# * QEMU version: CPU models may look different depending on the QEMU
> -# version. (Except for CPU models reported as "static" in
> -# query-cpu-definitions.)
> -# * machine-type: CPU model may look different depending on the
> -# machine-type. (Except for CPU models reported as "static" in
> -# query-cpu-definitions.)
> -# * machine options (including accelerator): in some architectures,
> -# CPU models may look different depending on machine and accelerator
> -# options. (Except for CPU models reported as "static" in
> -# query-cpu-definitions.)
> -# * "-cpu" arguments and global properties: arguments to the -cpu
> -# option and global properties may affect expansion of CPU models.
> -# Using query-cpu-model-expansion while using these is not advised.
> -#
> -# Some architectures may not support all expansion types. s390x
> -# supports "full" and "static". Arm only supports "full".
> -#
> -# @model: description of the CPU model to expand
> -#
> -# @type: expansion type, specifying how to expand the CPU model
> -#
> -# Returns: a CpuModelExpansionInfo describing the expanded CPU model
> -#
> -# Errors:
> -# - if expanding CPU models is not supported
> -# - if the model cannot be expanded
> -# - if the model contains an unknown CPU definition name, unknown
> -# properties or properties with a wrong type
> -# - if an expansion type is not supported
> -#
> -# Since: 2.8
> -##
> -{ 'command': 'query-cpu-model-expansion',
> - 'data': { 'type': 'CpuModelExpansionType',
> - 'model': 'CpuModelInfo' },
> - 'returns': 'CpuModelExpansionInfo',
> - 'if': { 'any': [ 'TARGET_S390X',
> - 'TARGET_I386',
> - 'TARGET_ARM',
> - 'TARGET_LOONGARCH64',
> - 'TARGET_RISCV' ] } }
> -
> -##
> -# @CpuDefinitionInfo:
> -#
> -# Virtual CPU definition.
> -#
> -# @name: the name of the CPU definition
> -#
> -# @migration-safe: whether a CPU definition can be safely used for
> -# migration in combination with a QEMU compatibility machine when
> -# migrating between different QEMU versions and between hosts with
> -# different sets of (hardware or software) capabilities. If not
> -# provided, information is not available and callers should not
> -# assume the CPU definition to be migration-safe. (since 2.8)
> -#
> -# @static: whether a CPU definition is static and will not change
> -# depending on QEMU version, machine type, machine options and
> -# accelerator options. A static model is always migration-safe.
> -# (since 2.8)
> -#
> -# @unavailable-features: List of properties that prevent the CPU model
> -# from running in the current host. (since 2.8)
> -#
> -# @typename: Type name that can be used as argument to
> -# @device-list-properties, to introspect properties configurable
> -# using -cpu or -global. (since 2.9)
> -#
> -# @alias-of: Name of CPU model this model is an alias for. The target
> -# of the CPU model alias may change depending on the machine type.
> -# Management software is supposed to translate CPU model aliases
> -# in the VM configuration, because aliases may stop being
> -# migration-safe in the future (since 4.1)
> -#
> -# @deprecated: If true, this CPU model is deprecated and may be
> -# removed in some future version of QEMU according to the QEMU
> -# deprecation policy. (since 5.2)
> -#
> -# @unavailable-features is a list of QOM property names that represent
> -# CPU model attributes that prevent the CPU from running. If the QOM
> -# property is read-only, that means there's no known way to make the
> -# CPU model run in the current host. Implementations that choose not
> -# to provide specific information return the property name "type". If
> -# the property is read-write, it means that it MAY be possible to run
> -# the CPU model in the current host if that property is changed.
> -# Management software can use it as hints to suggest or choose an
> -# alternative for the user, or just to generate meaningful error
> -# messages explaining why the CPU model can't be used. If
> -# @unavailable-features is an empty list, the CPU model is runnable
> -# using the current host and machine-type. If @unavailable-features
> -# is not present, runnability information for the CPU is not
> -# available.
> -#
> -# Since: 1.2
> -##
> -{ 'struct': 'CpuDefinitionInfo',
> - 'data': { 'name': 'str',
> - '*migration-safe': 'bool',
> - 'static': 'bool',
> - '*unavailable-features': [ 'str' ],
> - 'typename': 'str',
> - '*alias-of' : 'str',
> - 'deprecated' : 'bool' },
> - 'if': { 'any': [ 'TARGET_PPC',
> - 'TARGET_ARM',
> - 'TARGET_I386',
> - 'TARGET_S390X',
> - 'TARGET_MIPS',
> - 'TARGET_LOONGARCH64',
> - 'TARGET_RISCV' ] } }
> -
> -##
> -# @query-cpu-definitions:
> -#
> -# Return a list of supported virtual CPU definitions
> -#
> -# Returns: a list of CpuDefinitionInfo
> -#
> -# Since: 1.2
> -##
> -{ 'command': 'query-cpu-definitions', 'returns': ['CpuDefinitionInfo'],
> - 'if': { 'any': [ 'TARGET_PPC',
> - 'TARGET_ARM',
> - 'TARGET_I386',
> - 'TARGET_S390X',
> - 'TARGET_MIPS',
> - 'TARGET_LOONGARCH64',
> - 'TARGET_RISCV' ] } }
> -
Stuff deleted above is added to qapi/machine.json. Okay.
Stuff deleted below is gone until the next commit adds it back to
machine-s390x.json. Build fails. Oops :)
> -##
> -# @S390CpuPolarization:
> -#
> -# An enumeration of CPU polarization that can be assumed by a virtual
> -# S390 CPU
> -#
> -# Since: 8.2
> -##
> -{ 'enum': 'S390CpuPolarization',
> - 'data': [ 'horizontal', 'vertical' ],
> - 'if': 'TARGET_S390X'
> -}
> -
> -##
> -# @set-cpu-topology:
> -#
> -# Modify the topology by moving the CPU inside the topology tree, or
> -# by changing a modifier attribute of a CPU. Absent values will not
> -# be modified.
> -#
> -# @core-id: the vCPU ID to be moved
> -#
> -# @socket-id: destination socket to move the vCPU to
> -#
> -# @book-id: destination book to move the vCPU to
> -#
> -# @drawer-id: destination drawer to move the vCPU to
> -#
> -# @entitlement: entitlement to set
> -#
> -# @dedicated: whether the provisioning of real to virtual CPU is
> -# dedicated
> -#
> -# Features:
> -#
> -# @unstable: This command is experimental.
> -#
> -# Since: 8.2
> -##
> -{ 'command': 'set-cpu-topology',
> - 'data': {
> - 'core-id': 'uint16',
> - '*socket-id': 'uint16',
> - '*book-id': 'uint16',
> - '*drawer-id': 'uint16',
> - '*entitlement': 'S390CpuEntitlement',
> - '*dedicated': 'bool'
> - },
> - 'features': [ 'unstable' ],
> - 'if': { 'all': [ 'TARGET_S390X' , 'CONFIG_KVM' ] }
> -}
> -
> -##
> -# @CPU_POLARIZATION_CHANGE:
> -#
> -# Emitted when the guest asks to change the polarization.
> -#
> -# The guest can tell the host (via the PTF instruction) whether the
> -# CPUs should be provisioned using horizontal or vertical
> -# polarization.
> -#
> -# On horizontal polarization the host is expected to provision all
> -# vCPUs equally.
> -#
> -# On vertical polarization the host can provision each vCPU
> -# differently. The guest will get information on the details of the
> -# provisioning the next time it uses the STSI(15) instruction.
> -#
> -# @polarization: polarization specified by the guest
> -#
> -# Features:
> -#
> -# @unstable: This event is experimental.
> -#
> -# Since: 8.2
> -#
> -# .. qmp-example::
> -#
> -# <- { "event": "CPU_POLARIZATION_CHANGE",
> -# "data": { "polarization": "horizontal" },
> -# "timestamp": { "seconds": 1401385907, "microseconds": 422329 } }
> -##
> -{ 'event': 'CPU_POLARIZATION_CHANGE',
> - 'data': { 'polarization': 'S390CpuPolarization' },
> - 'features': [ 'unstable' ],
> - 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] }
> -}
> -
> -##
> -# @CpuPolarizationInfo:
> -#
> -# The result of a CPU polarization query.
> -#
> -# @polarization: the CPU polarization
> -#
> -# Since: 8.2
> -##
> -{ 'struct': 'CpuPolarizationInfo',
> - 'data': { 'polarization': 'S390CpuPolarization' },
> - 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] }
> -}
> -
> -##
> -# @query-s390x-cpu-polarization:
> -#
> -# Features:
> -#
> -# @unstable: This command is experimental.
> -#
> -# Returns: the machine's CPU polarization
> -#
> -# Since: 8.2
> -##
> -{ 'command': 'query-s390x-cpu-polarization', 'returns': 'CpuPolarizationInfo',
> - 'features': [ 'unstable' ],
> - 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] }
> -}
[...]
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH v2 09/12] qapi: make most CPU commands unconditionally available
2025-05-17 6:00 ` Markus Armbruster
@ 2025-05-17 19:41 ` Pierrick Bouvier
0 siblings, 0 replies; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-17 19:41 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Peter Maydell
On 5/16/25 11:00 PM, Markus Armbruster wrote:
> Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
>
>> From: Daniel P. Berrangé <berrange@redhat.com>
>>
>> This removes the TARGET_* conditions from all the CPU commands
>> that are conceptually target independent. Top level stubs are
>> provided to cope with targets which do not currently implement
>> all of the commands.
>>
>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>> ---
>> MAINTAINERS | 1 -
>> qapi/machine-target.json | 522 --------------------------
>> qapi/machine.json | 363 ++++++++++++++++++
>> stubs/monitor-cpu-s390x.c | 23 ++
>> stubs/monitor-cpu.c | 21 ++
>> target/arm/arm-qmp-cmds.c | 2 +-
>> target/i386/cpu-system.c | 2 +-
>> target/i386/cpu.c | 2 +-
>> target/loongarch/loongarch-qmp-cmds.c | 2 +-
>> target/mips/system/mips-qmp-cmds.c | 12 +-
>> target/ppc/ppc-qmp-cmds.c | 12 +-
>> target/riscv/riscv-qmp-cmds.c | 2 +-
>> target/s390x/cpu_models_system.c | 2 +-
>> stubs/meson.build | 2 +
>> 14 files changed, 437 insertions(+), 531 deletions(-)
>> delete mode 100644 qapi/machine-target.json
>> create mode 100644 stubs/monitor-cpu-s390x.c
>> create mode 100644 stubs/monitor-cpu.c
>>
[...]
>> -##
>> -# @query-cpu-definitions:
>> -#
>> -# Return a list of supported virtual CPU definitions
>> -#
>> -# Returns: a list of CpuDefinitionInfo
>> -#
>> -# Since: 1.2
>> -##
>> -{ 'command': 'query-cpu-definitions', 'returns': ['CpuDefinitionInfo'],
>> - 'if': { 'any': [ 'TARGET_PPC',
>> - 'TARGET_ARM',
>> - 'TARGET_I386',
>> - 'TARGET_S390X',
>> - 'TARGET_MIPS',
>> - 'TARGET_LOONGARCH64',
>> - 'TARGET_RISCV' ] } }
>> -
>
> Stuff deleted above is added to qapi/machine.json. Okay.
>
> Stuff deleted below is gone until the next commit adds it back to
> machine-s390x.json. Build fails. Oops :)
>
Thanks for catching this!
I'll fix order of deletion, and make sure every commit compiles cleanly.
Thanks,
Pierrick
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 09/12] qapi: make most CPU commands unconditionally available
2025-05-15 17:27 ` [PATCH v2 09/12] qapi: make most CPU commands unconditionally available Pierrick Bouvier
2025-05-17 6:00 ` Markus Armbruster
@ 2025-05-19 6:29 ` Markus Armbruster
2025-05-21 19:29 ` Pierrick Bouvier
1 sibling, 1 reply; 28+ messages in thread
From: Markus Armbruster @ 2025-05-19 6:29 UTC (permalink / raw)
To: Pierrick Bouvier
Cc: qemu-devel, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Markus Armbruster, Peter Maydell
Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
> From: Daniel P. Berrangé <berrange@redhat.com>
>
> This removes the TARGET_* conditions from all the CPU commands
> that are conceptually target independent. Top level stubs are
> provided to cope with targets which do not currently implement
> all of the commands.
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
[...]
> diff --git a/qapi/machine-target.json b/qapi/machine-target.json
> deleted file mode 100644
> index e153291a7fc..00000000000
> --- a/qapi/machine-target.json
> +++ /dev/null
[...]
> -##
> -# @query-cpu-model-comparison:
> -#
> -# Compares two CPU models, @modela and @modelb, returning how they
> -# compare in a specific configuration. The results indicates how
> -# both models compare regarding runnability. This result can be
> -# used by tooling to make decisions if a certain CPU model will
> -# run in a certain configuration or if a compatible CPU model has
> -# to be created by baselining.
> -#
> -# Usually, a CPU model is compared against the maximum possible CPU
> -# model of a certain configuration (e.g. the "host" model for KVM).
> -# If that CPU model is identical or a subset, it will run in that
> -# configuration.
> -#
> -# The result returned by this command may be affected by:
> -#
> -# * QEMU version: CPU models may look different depending on the QEMU
> -# version. (Except for CPU models reported as "static" in
> -# query-cpu-definitions.)
> -# * machine-type: CPU model may look different depending on the
> -# machine-type. (Except for CPU models reported as "static" in
> -# query-cpu-definitions.)
> -# * machine options (including accelerator): in some architectures,
> -# CPU models may look different depending on machine and accelerator
> -# options. (Except for CPU models reported as "static" in
> -# query-cpu-definitions.)
> -# * "-cpu" arguments and global properties: arguments to the -cpu
> -# option and global properties may affect expansion of CPU models.
> -# Using query-cpu-model-expansion while using these is not advised.
> -#
> -# Some architectures may not support comparing CPU models. s390x
> -# supports comparing CPU models.
> -#
> -# @modela: description of the first CPU model to compare, referred to
> -# as "model A" in CpuModelCompareResult
> -#
> -# @modelb: description of the second CPU model to compare, referred to
> -# as "model B" in CpuModelCompareResult
> -#
> -# Returns: a CpuModelCompareInfo describing how both CPU models
> -# compare
> -#
> -# Errors:
> -# - if comparing CPU models is not supported
> -# - if a model cannot be used
> -# - if a model contains an unknown cpu definition name, unknown
> -# properties or properties with wrong types.
> -#
> -# .. note:: This command isn't specific to s390x, but is only
> -# implemented on this architecture currently.
We lose this note. Intentional?
Perhaps because we also have the "Some architectures ..." paragraph
above?
> -#
> -# Since: 2.8
> -##
> -{ 'command': 'query-cpu-model-comparison',
> - 'data': { 'modela': 'CpuModelInfo', 'modelb': 'CpuModelInfo' },
> - 'returns': 'CpuModelCompareInfo',
> - 'if': 'TARGET_S390X' }
> -
> -##
> -# @query-cpu-model-baseline:
> -#
> -# Baseline two CPU models, @modela and @modelb, creating a compatible
> -# third model. The created model will always be a static,
> -# migration-safe CPU model (see "static" CPU model expansion for
> -# details).
> -#
> -# This interface can be used by tooling to create a compatible CPU
> -# model out two CPU models. The created CPU model will be identical
> -# to or a subset of both CPU models when comparing them. Therefore,
> -# the created CPU model is guaranteed to run where the given CPU
> -# models run.
> -#
> -# The result returned by this command may be affected by:
> -#
> -# * QEMU version: CPU models may look different depending on the QEMU
> -# version. (Except for CPU models reported as "static" in
> -# query-cpu-definitions.)
> -# * machine-type: CPU model may look different depending on the
> -# machine-type. (Except for CPU models reported as "static" in
> -# query-cpu-definitions.)
> -# * machine options (including accelerator): in some architectures,
> -# CPU models may look different depending on machine and accelerator
> -# options. (Except for CPU models reported as "static" in
> -# query-cpu-definitions.)
> -# * "-cpu" arguments and global properties: arguments to the -cpu
> -# option and global properties may affect expansion of CPU models.
> -# Using query-cpu-model-expansion while using these is not advised.
> -#
> -# Some architectures may not support baselining CPU models. s390x
> -# supports baselining CPU models.
> -#
> -# @modela: description of the first CPU model to baseline
> -#
> -# @modelb: description of the second CPU model to baseline
> -#
> -# Returns: a CpuModelBaselineInfo describing the baselined CPU model
> -#
> -# Errors:
> -# - if baselining CPU models is not supported
> -# - if a model cannot be used
> -# - if a model contains an unknown cpu definition name, unknown
> -# properties or properties with wrong types.
> -#
> -# .. note:: This command isn't specific to s390x, but is only
> -# implemented on this architecture currently.
We lose this note. Intentional?
Perhaps because we also have the "Some architectures ..." paragraph
above?
> -#
> -# Since: 2.8
> -##
> -{ 'command': 'query-cpu-model-baseline',
> - 'data': { 'modela': 'CpuModelInfo',
> - 'modelb': 'CpuModelInfo' },
> - 'returns': 'CpuModelBaselineInfo',
> - 'if': 'TARGET_S390X' }
[...]
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH v2 09/12] qapi: make most CPU commands unconditionally available
2025-05-19 6:29 ` Markus Armbruster
@ 2025-05-21 19:29 ` Pierrick Bouvier
2025-05-22 5:12 ` Markus Armbruster
0 siblings, 1 reply; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-21 19:29 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Peter Maydell
On 5/18/25 11:29 PM, Markus Armbruster wrote:
> Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
>
>> From: Daniel P. Berrangé <berrange@redhat.com>
>>
>> This removes the TARGET_* conditions from all the CPU commands
>> that are conceptually target independent. Top level stubs are
>> provided to cope with targets which do not currently implement
>> all of the commands.
>>
>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>
> [...]
>
>> diff --git a/qapi/machine-target.json b/qapi/machine-target.json
>> deleted file mode 100644
>> index e153291a7fc..00000000000
>> --- a/qapi/machine-target.json
>> +++ /dev/null
>
> [...]
>
>> -##
>> -# @query-cpu-model-comparison:
>> -#
>> -# Compares two CPU models, @modela and @modelb, returning how they
>> -# compare in a specific configuration. The results indicates how
>> -# both models compare regarding runnability. This result can be
>> -# used by tooling to make decisions if a certain CPU model will
>> -# run in a certain configuration or if a compatible CPU model has
>> -# to be created by baselining.
>> -#
>> -# Usually, a CPU model is compared against the maximum possible CPU
>> -# model of a certain configuration (e.g. the "host" model for KVM).
>> -# If that CPU model is identical or a subset, it will run in that
>> -# configuration.
>> -#
>> -# The result returned by this command may be affected by:
>> -#
>> -# * QEMU version: CPU models may look different depending on the QEMU
>> -# version. (Except for CPU models reported as "static" in
>> -# query-cpu-definitions.)
>> -# * machine-type: CPU model may look different depending on the
>> -# machine-type. (Except for CPU models reported as "static" in
>> -# query-cpu-definitions.)
>> -# * machine options (including accelerator): in some architectures,
>> -# CPU models may look different depending on machine and accelerator
>> -# options. (Except for CPU models reported as "static" in
>> -# query-cpu-definitions.)
>> -# * "-cpu" arguments and global properties: arguments to the -cpu
>> -# option and global properties may affect expansion of CPU models.
>> -# Using query-cpu-model-expansion while using these is not advised.
>> -#
>> -# Some architectures may not support comparing CPU models. s390x
>> -# supports comparing CPU models.
>> -#
>> -# @modela: description of the first CPU model to compare, referred to
>> -# as "model A" in CpuModelCompareResult
>> -#
>> -# @modelb: description of the second CPU model to compare, referred to
>> -# as "model B" in CpuModelCompareResult
>> -#
>> -# Returns: a CpuModelCompareInfo describing how both CPU models
>> -# compare
>> -#
>> -# Errors:
>> -# - if comparing CPU models is not supported
>> -# - if a model cannot be used
>> -# - if a model contains an unknown cpu definition name, unknown
>> -# properties or properties with wrong types.
>> -#
>> -# .. note:: This command isn't specific to s390x, but is only
>> -# implemented on this architecture currently.
>
> We lose this note. Intentional?
>
> Perhaps because we also have the "Some architectures ..." paragraph
> above?
>
>> -#
>> -# Since: 2.8
>> -##
>> -{ 'command': 'query-cpu-model-comparison',
>> - 'data': { 'modela': 'CpuModelInfo', 'modelb': 'CpuModelInfo' },
>> - 'returns': 'CpuModelCompareInfo',
>> - 'if': 'TARGET_S390X' }
>> -
>> -##
>> -# @query-cpu-model-baseline:
>> -#
>> -# Baseline two CPU models, @modela and @modelb, creating a compatible
>> -# third model. The created model will always be a static,
>> -# migration-safe CPU model (see "static" CPU model expansion for
>> -# details).
>> -#
>> -# This interface can be used by tooling to create a compatible CPU
>> -# model out two CPU models. The created CPU model will be identical
>> -# to or a subset of both CPU models when comparing them. Therefore,
>> -# the created CPU model is guaranteed to run where the given CPU
>> -# models run.
>> -#
>> -# The result returned by this command may be affected by:
>> -#
>> -# * QEMU version: CPU models may look different depending on the QEMU
>> -# version. (Except for CPU models reported as "static" in
>> -# query-cpu-definitions.)
>> -# * machine-type: CPU model may look different depending on the
>> -# machine-type. (Except for CPU models reported as "static" in
>> -# query-cpu-definitions.)
>> -# * machine options (including accelerator): in some architectures,
>> -# CPU models may look different depending on machine and accelerator
>> -# options. (Except for CPU models reported as "static" in
>> -# query-cpu-definitions.)
>> -# * "-cpu" arguments and global properties: arguments to the -cpu
>> -# option and global properties may affect expansion of CPU models.
>> -# Using query-cpu-model-expansion while using these is not advised.
>> -#
>> -# Some architectures may not support baselining CPU models. s390x
>> -# supports baselining CPU models.
>> -#
>> -# @modela: description of the first CPU model to baseline
>> -#
>> -# @modelb: description of the second CPU model to baseline
>> -#
>> -# Returns: a CpuModelBaselineInfo describing the baselined CPU model
>> -#
>> -# Errors:
>> -# - if baselining CPU models is not supported
>> -# - if a model cannot be used
>> -# - if a model contains an unknown cpu definition name, unknown
>> -# properties or properties with wrong types.
>> -#
>> -# .. note:: This command isn't specific to s390x, but is only
>> -# implemented on this architecture currently.
>
> We lose this note. Intentional?
>
> Perhaps because we also have the "Some architectures ..." paragraph
> above?
>
>> -#
>> -# Since: 2.8
>> -##
>> -{ 'command': 'query-cpu-model-baseline',
>> - 'data': { 'modela': 'CpuModelInfo',
>> - 'modelb': 'CpuModelInfo' },
>> - 'returns': 'CpuModelBaselineInfo',
>> - 'if': 'TARGET_S390X' }
>
> [...]
>
Yes, those notes don't have any reason to be present anymore, and the
new "Some architectures..." paragraph replaces them.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH v2 09/12] qapi: make most CPU commands unconditionally available
2025-05-21 19:29 ` Pierrick Bouvier
@ 2025-05-22 5:12 ` Markus Armbruster
2025-05-22 18:45 ` Pierrick Bouvier
0 siblings, 1 reply; 28+ messages in thread
From: Markus Armbruster @ 2025-05-22 5:12 UTC (permalink / raw)
To: Pierrick Bouvier
Cc: qemu-devel, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Peter Maydell
Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
> On 5/18/25 11:29 PM, Markus Armbruster wrote:
>> Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
>>
>>> From: Daniel P. Berrangé <berrange@redhat.com>
>>>
>>> This removes the TARGET_* conditions from all the CPU commands
>>> that are conceptually target independent. Top level stubs are
>>> provided to cope with targets which do not currently implement
>>> all of the commands.
>>>
>>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
>>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>>
>> [...]
>>
>>> diff --git a/qapi/machine-target.json b/qapi/machine-target.json
>>> deleted file mode 100644
>>> index e153291a7fc..00000000000
>>> --- a/qapi/machine-target.json
>>> +++ /dev/null
>>
>> [...]
>>
>>> -##
>>> -# @query-cpu-model-comparison:
>>> -#
>>> -# Compares two CPU models, @modela and @modelb, returning how they
>>> -# compare in a specific configuration. The results indicates how
>>> -# both models compare regarding runnability. This result can be
>>> -# used by tooling to make decisions if a certain CPU model will
>>> -# run in a certain configuration or if a compatible CPU model has
>>> -# to be created by baselining.
>>> -#
>>> -# Usually, a CPU model is compared against the maximum possible CPU
>>> -# model of a certain configuration (e.g. the "host" model for KVM).
>>> -# If that CPU model is identical or a subset, it will run in that
>>> -# configuration.
>>> -#
>>> -# The result returned by this command may be affected by:
>>> -#
>>> -# * QEMU version: CPU models may look different depending on the QEMU
>>> -# version. (Except for CPU models reported as "static" in
>>> -# query-cpu-definitions.)
>>> -# * machine-type: CPU model may look different depending on the
>>> -# machine-type. (Except for CPU models reported as "static" in
>>> -# query-cpu-definitions.)
>>> -# * machine options (including accelerator): in some architectures,
>>> -# CPU models may look different depending on machine and accelerator
>>> -# options. (Except for CPU models reported as "static" in
>>> -# query-cpu-definitions.)
>>> -# * "-cpu" arguments and global properties: arguments to the -cpu
>>> -# option and global properties may affect expansion of CPU models.
>>> -# Using query-cpu-model-expansion while using these is not advised.
>>> -#
>>> -# Some architectures may not support comparing CPU models. s390x
>>> -# supports comparing CPU models.
>>> -#
>>> -# @modela: description of the first CPU model to compare, referred to
>>> -# as "model A" in CpuModelCompareResult
>>> -#
>>> -# @modelb: description of the second CPU model to compare, referred to
>>> -# as "model B" in CpuModelCompareResult
>>> -#
>>> -# Returns: a CpuModelCompareInfo describing how both CPU models
>>> -# compare
>>> -#
>>> -# Errors:
>>> -# - if comparing CPU models is not supported
>>> -# - if a model cannot be used
>>> -# - if a model contains an unknown cpu definition name, unknown
>>> -# properties or properties with wrong types.
>>> -#
>>> -# .. note:: This command isn't specific to s390x, but is only
>>> -# implemented on this architecture currently.
>>
>> We lose this note. Intentional?
>>
>> Perhaps because we also have the "Some architectures ..." paragraph
>> above?
>>
>>> -#
>>> -# Since: 2.8
>>> -##
>>> -{ 'command': 'query-cpu-model-comparison',
>>> - 'data': { 'modela': 'CpuModelInfo', 'modelb': 'CpuModelInfo' },
>>> - 'returns': 'CpuModelCompareInfo',
>>> - 'if': 'TARGET_S390X' }
>>> -
>>> -##
>>> -# @query-cpu-model-baseline:
>>> -#
>>> -# Baseline two CPU models, @modela and @modelb, creating a compatible
>>> -# third model. The created model will always be a static,
>>> -# migration-safe CPU model (see "static" CPU model expansion for
>>> -# details).
>>> -#
>>> -# This interface can be used by tooling to create a compatible CPU
>>> -# model out two CPU models. The created CPU model will be identical
>>> -# to or a subset of both CPU models when comparing them. Therefore,
>>> -# the created CPU model is guaranteed to run where the given CPU
>>> -# models run.
>>> -#
>>> -# The result returned by this command may be affected by:
>>> -#
>>> -# * QEMU version: CPU models may look different depending on the QEMU
>>> -# version. (Except for CPU models reported as "static" in
>>> -# query-cpu-definitions.)
>>> -# * machine-type: CPU model may look different depending on the
>>> -# machine-type. (Except for CPU models reported as "static" in
>>> -# query-cpu-definitions.)
>>> -# * machine options (including accelerator): in some architectures,
>>> -# CPU models may look different depending on machine and accelerator
>>> -# options. (Except for CPU models reported as "static" in
>>> -# query-cpu-definitions.)
>>> -# * "-cpu" arguments and global properties: arguments to the -cpu
>>> -# option and global properties may affect expansion of CPU models.
>>> -# Using query-cpu-model-expansion while using these is not advised.
>>> -#
>>> -# Some architectures may not support baselining CPU models. s390x
>>> -# supports baselining CPU models.
>>> -#
>>> -# @modela: description of the first CPU model to baseline
>>> -#
>>> -# @modelb: description of the second CPU model to baseline
>>> -#
>>> -# Returns: a CpuModelBaselineInfo describing the baselined CPU model
>>> -#
>>> -# Errors:
>>> -# - if baselining CPU models is not supported
>>> -# - if a model cannot be used
>>> -# - if a model contains an unknown cpu definition name, unknown
>>> -# properties or properties with wrong types.
>>> -#
>>> -# .. note:: This command isn't specific to s390x, but is only
>>> -# implemented on this architecture currently.
>>
>> We lose this note. Intentional?
>>
>> Perhaps because we also have the "Some architectures ..." paragraph
>> above?
>>
>>> -#
>>> -# Since: 2.8
>>> -##
>>> -{ 'command': 'query-cpu-model-baseline',
>>> - 'data': { 'modela': 'CpuModelInfo',
>>> - 'modelb': 'CpuModelInfo' },
>>> - 'returns': 'CpuModelBaselineInfo',
>>> - 'if': 'TARGET_S390X' }
>>
>> [...]
>>
>
> Yes, those notes don't have any reason to be present anymore, and the
> new "Some architectures..." paragraph replaces them.
Okay. A brief mention in the commit message like "Adjust the doc
comments accordingly" might be helpful. Up to you!
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH v2 09/12] qapi: make most CPU commands unconditionally available
2025-05-22 5:12 ` Markus Armbruster
@ 2025-05-22 18:45 ` Pierrick Bouvier
0 siblings, 0 replies; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-22 18:45 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Peter Maydell
On 5/21/25 10:12 PM, Markus Armbruster wrote:
> Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
>
>> On 5/18/25 11:29 PM, Markus Armbruster wrote:
>>> Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
>>>
>>>> From: Daniel P. Berrangé <berrange@redhat.com>
>>>>
>>>> This removes the TARGET_* conditions from all the CPU commands
>>>> that are conceptually target independent. Top level stubs are
>>>> provided to cope with targets which do not currently implement
>>>> all of the commands.
>>>>
>>>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>>>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
>>>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>>>
>>> [...]
>>>
>>>> diff --git a/qapi/machine-target.json b/qapi/machine-target.json
>>>> deleted file mode 100644
>>>> index e153291a7fc..00000000000
>>>> --- a/qapi/machine-target.json
>>>> +++ /dev/null
>>>
>>> [...]
>>>
>>>> -##
>>>> -# @query-cpu-model-comparison:
>>>> -#
>>>> -# Compares two CPU models, @modela and @modelb, returning how they
>>>> -# compare in a specific configuration. The results indicates how
>>>> -# both models compare regarding runnability. This result can be
>>>> -# used by tooling to make decisions if a certain CPU model will
>>>> -# run in a certain configuration or if a compatible CPU model has
>>>> -# to be created by baselining.
>>>> -#
>>>> -# Usually, a CPU model is compared against the maximum possible CPU
>>>> -# model of a certain configuration (e.g. the "host" model for KVM).
>>>> -# If that CPU model is identical or a subset, it will run in that
>>>> -# configuration.
>>>> -#
>>>> -# The result returned by this command may be affected by:
>>>> -#
>>>> -# * QEMU version: CPU models may look different depending on the QEMU
>>>> -# version. (Except for CPU models reported as "static" in
>>>> -# query-cpu-definitions.)
>>>> -# * machine-type: CPU model may look different depending on the
>>>> -# machine-type. (Except for CPU models reported as "static" in
>>>> -# query-cpu-definitions.)
>>>> -# * machine options (including accelerator): in some architectures,
>>>> -# CPU models may look different depending on machine and accelerator
>>>> -# options. (Except for CPU models reported as "static" in
>>>> -# query-cpu-definitions.)
>>>> -# * "-cpu" arguments and global properties: arguments to the -cpu
>>>> -# option and global properties may affect expansion of CPU models.
>>>> -# Using query-cpu-model-expansion while using these is not advised.
>>>> -#
>>>> -# Some architectures may not support comparing CPU models. s390x
>>>> -# supports comparing CPU models.
>>>> -#
>>>> -# @modela: description of the first CPU model to compare, referred to
>>>> -# as "model A" in CpuModelCompareResult
>>>> -#
>>>> -# @modelb: description of the second CPU model to compare, referred to
>>>> -# as "model B" in CpuModelCompareResult
>>>> -#
>>>> -# Returns: a CpuModelCompareInfo describing how both CPU models
>>>> -# compare
>>>> -#
>>>> -# Errors:
>>>> -# - if comparing CPU models is not supported
>>>> -# - if a model cannot be used
>>>> -# - if a model contains an unknown cpu definition name, unknown
>>>> -# properties or properties with wrong types.
>>>> -#
>>>> -# .. note:: This command isn't specific to s390x, but is only
>>>> -# implemented on this architecture currently.
>>>
>>> We lose this note. Intentional?
>>>
>>> Perhaps because we also have the "Some architectures ..." paragraph
>>> above?
>>>
>>>> -#
>>>> -# Since: 2.8
>>>> -##
>>>> -{ 'command': 'query-cpu-model-comparison',
>>>> - 'data': { 'modela': 'CpuModelInfo', 'modelb': 'CpuModelInfo' },
>>>> - 'returns': 'CpuModelCompareInfo',
>>>> - 'if': 'TARGET_S390X' }
>>>> -
>>>> -##
>>>> -# @query-cpu-model-baseline:
>>>> -#
>>>> -# Baseline two CPU models, @modela and @modelb, creating a compatible
>>>> -# third model. The created model will always be a static,
>>>> -# migration-safe CPU model (see "static" CPU model expansion for
>>>> -# details).
>>>> -#
>>>> -# This interface can be used by tooling to create a compatible CPU
>>>> -# model out two CPU models. The created CPU model will be identical
>>>> -# to or a subset of both CPU models when comparing them. Therefore,
>>>> -# the created CPU model is guaranteed to run where the given CPU
>>>> -# models run.
>>>> -#
>>>> -# The result returned by this command may be affected by:
>>>> -#
>>>> -# * QEMU version: CPU models may look different depending on the QEMU
>>>> -# version. (Except for CPU models reported as "static" in
>>>> -# query-cpu-definitions.)
>>>> -# * machine-type: CPU model may look different depending on the
>>>> -# machine-type. (Except for CPU models reported as "static" in
>>>> -# query-cpu-definitions.)
>>>> -# * machine options (including accelerator): in some architectures,
>>>> -# CPU models may look different depending on machine and accelerator
>>>> -# options. (Except for CPU models reported as "static" in
>>>> -# query-cpu-definitions.)
>>>> -# * "-cpu" arguments and global properties: arguments to the -cpu
>>>> -# option and global properties may affect expansion of CPU models.
>>>> -# Using query-cpu-model-expansion while using these is not advised.
>>>> -#
>>>> -# Some architectures may not support baselining CPU models. s390x
>>>> -# supports baselining CPU models.
>>>> -#
>>>> -# @modela: description of the first CPU model to baseline
>>>> -#
>>>> -# @modelb: description of the second CPU model to baseline
>>>> -#
>>>> -# Returns: a CpuModelBaselineInfo describing the baselined CPU model
>>>> -#
>>>> -# Errors:
>>>> -# - if baselining CPU models is not supported
>>>> -# - if a model cannot be used
>>>> -# - if a model contains an unknown cpu definition name, unknown
>>>> -# properties or properties with wrong types.
>>>> -#
>>>> -# .. note:: This command isn't specific to s390x, but is only
>>>> -# implemented on this architecture currently.
>>>
>>> We lose this note. Intentional?
>>>
>>> Perhaps because we also have the "Some architectures ..." paragraph
>>> above?
>>>
>>>> -#
>>>> -# Since: 2.8
>>>> -##
>>>> -{ 'command': 'query-cpu-model-baseline',
>>>> - 'data': { 'modela': 'CpuModelInfo',
>>>> - 'modelb': 'CpuModelInfo' },
>>>> - 'returns': 'CpuModelBaselineInfo',
>>>> - 'if': 'TARGET_S390X' }
>>>
>>> [...]
>>>
>>
>> Yes, those notes don't have any reason to be present anymore, and the
>> new "Some architectures..." paragraph replaces them.
>
> Okay. A brief mention in the commit message like "Adjust the doc
> comments accordingly" might be helpful. Up to you!
>
I add it on my side.
In case you'd be ready to pull this series, feel free to add it directly.
Thanks,
Pierrick
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 10/12] qapi: make s390x specific CPU commands unconditionally available
2025-05-15 17:27 [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema Pierrick Bouvier
` (8 preceding siblings ...)
2025-05-15 17:27 ` [PATCH v2 09/12] qapi: make most CPU commands unconditionally available Pierrick Bouvier
@ 2025-05-15 17:27 ` Pierrick Bouvier
2025-05-15 17:27 ` [PATCH v2 11/12] qapi: remove qapi_specific_outputs from meson.build Pierrick Bouvier
` (2 subsequent siblings)
12 siblings, 0 replies; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Markus Armbruster, Peter Maydell
From: Daniel P. Berrangé <berrange@redhat.com>
This removes the TARGET_S390X and CONFIG_KVM conditions from the
CPU commands that are conceptually specific to s390x. Top level
stubs are provided to cope with non-s390x targets, or builds
without KVM.
The removal of CONFIG_KVM is justified by the fact there is no
conceptual difference between running 'qemu-system-s390x -accel tcg'
on a build with and without KVM built-in, so apps only using TCG
can't rely on the CONFIG_KVM in the schema.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
qapi/machine-s390x.json | 121 ++++++++++++++++++++++++++++++++
qapi/qapi-schema.json | 2 +-
include/hw/s390x/cpu-topology.h | 2 +-
hw/s390x/cpu-topology.c | 4 +-
stubs/monitor-cpu-s390x-kvm.c | 22 ++++++
tests/qtest/qmp-cmd-test.c | 1 +
qapi/meson.build | 2 +-
stubs/meson.build | 1 +
8 files changed, 150 insertions(+), 5 deletions(-)
create mode 100644 qapi/machine-s390x.json
create mode 100644 stubs/monitor-cpu-s390x-kvm.c
diff --git a/qapi/machine-s390x.json b/qapi/machine-s390x.json
new file mode 100644
index 00000000000..966dbd61d2e
--- /dev/null
+++ b/qapi/machine-s390x.json
@@ -0,0 +1,121 @@
+# -*- Mode: Python -*-
+# vim: filetype=python
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# This work is licensed under the terms of the GNU GPL, version 2 or later.
+# See the COPYING file in the top-level directory.
+
+{ 'include': 'machine-common.json' }
+
+##
+# @S390CpuPolarization:
+#
+# An enumeration of CPU polarization that can be assumed by a virtual
+# S390 CPU
+#
+# Since: 8.2
+##
+{ 'enum': 'S390CpuPolarization',
+ 'data': [ 'horizontal', 'vertical' ]
+}
+
+##
+# @set-cpu-topology:
+#
+# Modify the topology by moving the CPU inside the topology tree, or
+# by changing a modifier attribute of a CPU. Absent values will not
+# be modified.
+#
+# @core-id: the vCPU ID to be moved
+#
+# @socket-id: destination socket to move the vCPU to
+#
+# @book-id: destination book to move the vCPU to
+#
+# @drawer-id: destination drawer to move the vCPU to
+#
+# @entitlement: entitlement to set
+#
+# @dedicated: whether the provisioning of real to virtual CPU is
+# dedicated
+#
+# Features:
+#
+# @unstable: This command is experimental.
+#
+# Since: 8.2
+##
+{ 'command': 'set-cpu-topology',
+ 'data': {
+ 'core-id': 'uint16',
+ '*socket-id': 'uint16',
+ '*book-id': 'uint16',
+ '*drawer-id': 'uint16',
+ '*entitlement': 'S390CpuEntitlement',
+ '*dedicated': 'bool'
+ },
+ 'features': [ 'unstable' ]
+}
+
+##
+# @CPU_POLARIZATION_CHANGE:
+#
+# Emitted when the guest asks to change the polarization.
+#
+# The guest can tell the host (via the PTF instruction) whether the
+# CPUs should be provisioned using horizontal or vertical
+# polarization.
+#
+# On horizontal polarization the host is expected to provision all
+# vCPUs equally.
+#
+# On vertical polarization the host can provision each vCPU
+# differently. The guest will get information on the details of the
+# provisioning the next time it uses the STSI(15) instruction.
+#
+# @polarization: polarization specified by the guest
+#
+# Features:
+#
+# @unstable: This event is experimental.
+#
+# Since: 8.2
+#
+# .. qmp-example::
+#
+# <- { "event": "CPU_POLARIZATION_CHANGE",
+# "data": { "polarization": "horizontal" },
+# "timestamp": { "seconds": 1401385907, "microseconds": 422329 } }
+##
+{ 'event': 'CPU_POLARIZATION_CHANGE',
+ 'data': { 'polarization': 'S390CpuPolarization' },
+ 'features': [ 'unstable' ]
+}
+
+##
+# @CpuPolarizationInfo:
+#
+# The result of a CPU polarization query.
+#
+# @polarization: the CPU polarization
+#
+# Since: 8.2
+##
+{ 'struct': 'CpuPolarizationInfo',
+ 'data': { 'polarization': 'S390CpuPolarization' }
+}
+
+##
+# @query-s390x-cpu-polarization:
+#
+# Features:
+#
+# @unstable: This command is experimental.
+#
+# Returns: the machine's CPU polarization
+#
+# Since: 8.2
+##
+{ 'command': 'query-s390x-cpu-polarization', 'returns': 'CpuPolarizationInfo',
+ 'features': [ 'unstable' ]
+}
diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json
index d8eb79cfda6..a8f66163cb7 100644
--- a/qapi/qapi-schema.json
+++ b/qapi/qapi-schema.json
@@ -57,7 +57,7 @@
{ 'include': 'qdev.json' }
{ 'include': 'machine-common.json' }
{ 'include': 'machine.json' }
-{ 'include': 'machine-target.json' }
+{ 'include': 'machine-s390x.json' }
{ 'include': 'replay.json' }
{ 'include': 'yank.json' }
{ 'include': 'misc.json' }
diff --git a/include/hw/s390x/cpu-topology.h b/include/hw/s390x/cpu-topology.h
index 9283c948e3a..d5e9aa43f8f 100644
--- a/include/hw/s390x/cpu-topology.h
+++ b/include/hw/s390x/cpu-topology.h
@@ -13,7 +13,7 @@
#include "qemu/queue.h"
#include "hw/boards.h"
-#include "qapi/qapi-types-machine-target.h"
+#include "qapi/qapi-types-machine-s390x.h"
#define S390_TOPOLOGY_CPU_IFL 0x03
diff --git a/hw/s390x/cpu-topology.c b/hw/s390x/cpu-topology.c
index 7d4e1f54727..b513f8936e4 100644
--- a/hw/s390x/cpu-topology.c
+++ b/hw/s390x/cpu-topology.c
@@ -23,8 +23,8 @@
#include "target/s390x/cpu.h"
#include "hw/s390x/s390-virtio-ccw.h"
#include "hw/s390x/cpu-topology.h"
-#include "qapi/qapi-commands-machine-target.h"
-#include "qapi/qapi-events-machine-target.h"
+#include "qapi/qapi-commands-machine-s390x.h"
+#include "qapi/qapi-events-machine-s390x.h"
/*
* s390_topology is used to keep the topology information.
diff --git a/stubs/monitor-cpu-s390x-kvm.c b/stubs/monitor-cpu-s390x-kvm.c
new file mode 100644
index 00000000000..8683dd2d4c6
--- /dev/null
+++ b/stubs/monitor-cpu-s390x-kvm.c
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-machine-s390x.h"
+
+void qmp_set_cpu_topology(uint16_t core,
+ bool has_socket, uint16_t socket,
+ bool has_book, uint16_t book,
+ bool has_drawer, uint16_t drawer,
+ bool has_entitlement, S390CpuEntitlement entitlement,
+ bool has_dedicated, bool dedicated,
+ Error **errp)
+{
+ error_setg(errp, "CPU topology change is not supported on this target");
+}
+
+CpuPolarizationInfo *qmp_query_s390x_cpu_polarization(Error **errp)
+{
+ error_setg(errp, "CPU polarization is not supported on this target");
+ return NULL;
+}
diff --git a/tests/qtest/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c
index 15c88248b79..040d042810b 100644
--- a/tests/qtest/qmp-cmd-test.c
+++ b/tests/qtest/qmp-cmd-test.c
@@ -100,6 +100,7 @@ static bool query_is_ignored(const char *cmd)
/* Success depends on target arch: */
"query-cpu-definitions", /* arm, i386, ppc, s390x */
"query-gic-capabilities", /* arm */
+ "query-s390x-cpu-polarization", /* s390x */
/* Success depends on target-specific build configuration: */
"query-pci", /* CONFIG_PCI */
"x-query-virtio", /* CONFIG_VIRTIO */
diff --git a/qapi/meson.build b/qapi/meson.build
index ffe44f9e0b8..e038b636c9d 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -39,7 +39,7 @@ qapi_all_modules = [
'job',
'machine-common',
'machine',
- 'machine-target',
+ 'machine-s390x',
'migration',
'misc',
'net',
diff --git a/stubs/meson.build b/stubs/meson.build
index 3b2fad0824f..cef046e6854 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -84,6 +84,7 @@ if have_system
stub_ss.add(files('monitor-i386-xen.c'))
stub_ss.add(files('monitor-cpu.c'))
stub_ss.add(files('monitor-cpu-s390x.c'))
+ stub_ss.add(files('monitor-cpu-s390x-kvm.c'))
endif
if have_system or have_user
--
2.47.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH v2 11/12] qapi: remove qapi_specific_outputs from meson.build
2025-05-15 17:27 [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema Pierrick Bouvier
` (9 preceding siblings ...)
2025-05-15 17:27 ` [PATCH v2 10/12] qapi: make s390x specific " Pierrick Bouvier
@ 2025-05-15 17:27 ` Pierrick Bouvier
2025-05-19 8:50 ` Markus Armbruster
2025-05-15 17:27 ` [PATCH v2 12/12] qapi: make all generated files common Pierrick Bouvier
2025-05-21 22:41 ` [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema Pierrick Bouvier
12 siblings, 1 reply; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Markus Armbruster, Peter Maydell
There is no more QAPI files that need to be compiled per target, so we
can remove this.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
qapi/meson.build | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/qapi/meson.build b/qapi/meson.build
index e038b636c9d..7582c2b5bcf 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -92,7 +92,6 @@ qapi_util_outputs = [
]
qapi_inputs = []
-qapi_specific_outputs = []
foreach module : qapi_all_modules
qapi_inputs += [ files(module + '.json') ]
qapi_module_outputs = [
@@ -110,15 +109,11 @@ foreach module : qapi_all_modules
'qapi-commands-@0@.trace-events'.format(module),
]
endif
- if module.endswith('-target')
- qapi_specific_outputs += qapi_module_outputs
- else
- qapi_util_outputs += qapi_module_outputs
- endif
+ qapi_util_outputs += qapi_module_outputs
endforeach
qapi_files = custom_target('shared QAPI source files',
- output: qapi_util_outputs + qapi_specific_outputs + qapi_nonmodule_outputs,
+ output: qapi_util_outputs + qapi_nonmodule_outputs,
input: [ files('qapi-schema.json') ],
command: [ qapi_gen, '-o', 'qapi', '-b', '@INPUT0@' ],
depend_files: [ qapi_inputs, qapi_gen_depends ])
@@ -138,7 +133,7 @@ foreach output : qapi_util_outputs
i = i + 1
endforeach
-foreach output : qapi_specific_outputs + qapi_nonmodule_outputs
+foreach output : qapi_nonmodule_outputs
if output.endswith('.h')
genh += qapi_files[i]
endif
--
2.47.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH v2 11/12] qapi: remove qapi_specific_outputs from meson.build
2025-05-15 17:27 ` [PATCH v2 11/12] qapi: remove qapi_specific_outputs from meson.build Pierrick Bouvier
@ 2025-05-19 8:50 ` Markus Armbruster
0 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2025-05-19 8:50 UTC (permalink / raw)
To: Pierrick Bouvier
Cc: qemu-devel, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Peter Maydell
Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
> There is no more QAPI files that need to be compiled per target, so we
> can remove this.
Yes, with the target-specific conditonals gone, no QAPI-generated file
needs to be compiled per target. Garbage collection has two parts:
* qapi_specific_outputs has become empty, and can be removed (this
patch)
* Monolithic files (qapi_nonmodule_outputs) can now be compiled just
once (next patch)
Suggest to say "qapi_specific_outputs is now empty, so we can ...".
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 12/12] qapi: make all generated files common
2025-05-15 17:27 [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema Pierrick Bouvier
` (10 preceding siblings ...)
2025-05-15 17:27 ` [PATCH v2 11/12] qapi: remove qapi_specific_outputs from meson.build Pierrick Bouvier
@ 2025-05-15 17:27 ` Pierrick Bouvier
2025-05-19 9:14 ` Markus Armbruster
2025-05-21 22:41 ` [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema Pierrick Bouvier
12 siblings, 1 reply; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-15 17:27 UTC (permalink / raw)
To: qemu-devel
Cc: Pierrick Bouvier, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Markus Armbruster, Peter Maydell
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
qapi/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qapi/meson.build b/qapi/meson.build
index 7582c2b5bcf..6cc3afce721 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -140,6 +140,6 @@ foreach output : qapi_nonmodule_outputs
if output.endswith('.trace-events')
qapi_trace_events += qapi_files[i]
endif
- specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: qapi_files[i])
+ system_ss.add(if_true: qapi_files[i])
i = i + 1
endforeach
--
2.47.2
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH v2 12/12] qapi: make all generated files common
2025-05-15 17:27 ` [PATCH v2 12/12] qapi: make all generated files common Pierrick Bouvier
@ 2025-05-19 9:14 ` Markus Armbruster
0 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2025-05-19 9:14 UTC (permalink / raw)
To: Pierrick Bouvier
Cc: qemu-devel, Thomas Huth, Richard Henderson, Michael Roth,
Paolo Bonzini, Philippe Mathieu-Daudé, berrange,
Peter Maydell
Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> ---
> qapi/meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/qapi/meson.build b/qapi/meson.build
> index 7582c2b5bcf..6cc3afce721 100644
> --- a/qapi/meson.build
> +++ b/qapi/meson.build
> @@ -140,6 +140,6 @@ foreach output : qapi_nonmodule_outputs
> if output.endswith('.trace-events')
> qapi_trace_events += qapi_files[i]
> endif
> - specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: qapi_files[i])
> + system_ss.add(if_true: qapi_files[i])
> i = i + 1
> endforeach
I think this can be simplified further:
diff --git a/qapi/meson.build b/qapi/meson.build
index 6cc3afce72..3b035aea33 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -85,8 +85,7 @@ qapi_nonmodule_outputs = [
'qapi-emit-events.c', 'qapi-emit-events.h',
]
-# First build all sources
-qapi_util_outputs = [
+qapi_outputs = qapi_nonmodule_outputs + [
'qapi-builtin-types.c', 'qapi-builtin-visit.c',
'qapi-builtin-types.h', 'qapi-builtin-visit.h',
]
@@ -109,20 +108,17 @@ foreach module : qapi_all_modules
'qapi-commands-@0@.trace-events'.format(module),
]
endif
- qapi_util_outputs += qapi_module_outputs
+ qapi_outputs += qapi_module_outputs
endforeach
qapi_files = custom_target('shared QAPI source files',
- output: qapi_util_outputs + qapi_nonmodule_outputs,
+ output: qapi_outputs,
input: [ files('qapi-schema.json') ],
command: [ qapi_gen, '-o', 'qapi', '-b', '@INPUT0@' ],
depend_files: [ qapi_inputs, qapi_gen_depends ])
-# Now go through all the outputs and add them to the right sourceset.
-# These loops must be synchronized with the output of the above custom target.
-
i = 0
-foreach output : qapi_util_outputs
+foreach output : qapi_outputs
if output.endswith('.h')
genh += qapi_files[i]
endif
@@ -132,14 +128,3 @@ foreach output : qapi_util_outputs
util_ss.add(qapi_files[i])
i = i + 1
endforeach
-
-foreach output : qapi_nonmodule_outputs
- if output.endswith('.h')
- genh += qapi_files[i]
- endif
- if output.endswith('.trace-events')
- qapi_trace_events += qapi_files[i]
- endif
- system_ss.add(if_true: qapi_files[i])
- i = i + 1
-endforeach
^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema
2025-05-15 17:27 [PATCH v2 00/12] qapi: remove all TARGET_* conditionals from the schema Pierrick Bouvier
` (11 preceding siblings ...)
2025-05-15 17:27 ` [PATCH v2 12/12] qapi: make all generated files common Pierrick Bouvier
@ 2025-05-21 22:41 ` Pierrick Bouvier
12 siblings, 0 replies; 28+ messages in thread
From: Pierrick Bouvier @ 2025-05-21 22:41 UTC (permalink / raw)
To: qemu-devel
Cc: Thomas Huth, Richard Henderson, Michael Roth, Paolo Bonzini,
Philippe Mathieu-Daudé, berrange, Markus Armbruster,
Peter Maydell
On 5/15/25 10:27 AM, Pierrick Bouvier wrote:
> This series exposes all qmp commands for any target unconditionally, allowing to
> compile QAPI generated code without any TARGET conditionals.
>
> Based on original RFC from Daniel P. Berrangé:
> https://lore.kernel.org/qemu-devel/20250508135816.673087-1-berrange@redhat.com/
>
> v2
> --
>
> - rtc-reset-reinjection now returns an error if the command is not applicable
> for current target (Markus & Daniel)
>
> v1
> --
>
> - remove file qapi/misc-target.json (Markus)
> - remove qapi/*-target.json from MAINTAINERS (Markus)
> - remove qapi_specific_outputs from qapi/meson.build (Markus)
> - update comment in rtc-reset-reinjection stub (Markus)
> - build QAPI generated code only once
>
v3 was posted here:
https://lore.kernel.org/qemu-devel/20250521223740.249720-1-pierrick.bouvier@linaro.org
^ permalink raw reply [flat|nested] 28+ messages in thread