| Message ID | 20250310133118.3881-4-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | qapi/machine: Make @dump-skeys command generic | expand |
On 10/03/2025 14.31, Philippe Mathieu-Daudé wrote: > Reduce misc-target.json by one target specific command. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > qapi/machine.json | 18 ++++++++++++++++++ > qapi/misc-target.json | 19 ------------------- > hw/core/machine-qmp-cmds.c | 13 +++++++++++++ > hw/s390x/s390-skeys.c | 6 +----- > 4 files changed, 32 insertions(+), 24 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
On Mon, Mar 10, 2025 at 02:31:18PM +0100, Philippe Mathieu-Daudé wrote: > Reduce misc-target.json by one target specific command. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > qapi/machine.json | 18 ++++++++++++++++++ > qapi/misc-target.json | 19 ------------------- > hw/core/machine-qmp-cmds.c | 13 +++++++++++++ > hw/s390x/s390-skeys.c | 6 +----- > 4 files changed, 32 insertions(+), 24 deletions(-) > > diff --git a/qapi/machine.json b/qapi/machine.json > index a6b8795b09e..53680bf0998 100644 > --- a/qapi/machine.json > +++ b/qapi/machine.json > @@ -1898,3 +1898,21 @@ > { 'command': 'x-query-interrupt-controllers', > 'returns': 'HumanReadableText', > 'features': [ 'unstable' ]} > + > +## > +# @dump-skeys: > +# > +# Dump guest's storage keys > +# > +# @filename: the path to the file to dump to > +# > +# Since: 2.5 > +# > +# .. qmp-example:: > +# > +# -> { "execute": "dump-skeys", > +# "arguments": { "filename": "/tmp/skeys" } } > +# <- { "return": {} } > +## Currently the 'if: TARGET_S390X' ends up in the documentation so users can see it is s390x-onl: https://www.qemu.org/docs/master/interop/qemu-qmp-ref.html#qapidoc-2890 Given there's no more conditional, the docs will loose this target info, which could be considered a regression. We could tweak the docs text to call this out: ## # @dump-skeys: # # Dump the storage keys for an s390x guest # With regards, Daniel
diff --git a/qapi/machine.json b/qapi/machine.json index a6b8795b09e..53680bf0998 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1898,3 +1898,21 @@ { 'command': 'x-query-interrupt-controllers', 'returns': 'HumanReadableText', 'features': [ 'unstable' ]} + +## +# @dump-skeys: +# +# Dump guest's storage keys +# +# @filename: the path to the file to dump to +# +# Since: 2.5 +# +# .. qmp-example:: +# +# -> { "execute": "dump-skeys", +# "arguments": { "filename": "/tmp/skeys" } } +# <- { "return": {} } +## +{ 'command': 'dump-skeys', + 'data': { 'filename': 'str' } } diff --git a/qapi/misc-target.json b/qapi/misc-target.json index 8d70bd24d8c..42e4a7417dc 100644 --- a/qapi/misc-target.json +++ b/qapi/misc-target.json @@ -274,25 +274,6 @@ 'returns': 'SevAttestationReport', 'if': 'TARGET_I386' } -## -# @dump-skeys: -# -# Dump guest's storage keys -# -# @filename: the path to the file to dump to -# -# Since: 2.5 -# -# .. qmp-example:: -# -# -> { "execute": "dump-skeys", -# "arguments": { "filename": "/tmp/skeys" } } -# <- { "return": {} } -## -{ 'command': 'dump-skeys', - 'data': { 'filename': 'str' }, - 'if': 'TARGET_S390X' } - ## # @GICCapability: # diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 3130c5cd456..b9ed0963bb4 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/acpi/vmgenid.h" #include "hw/boards.h" +#include "hw/core/sysemu-cpu-ops.h" #include "hw/intc/intc.h" #include "hw/mem/memory-device.h" #include "qapi/error.h" @@ -406,3 +407,15 @@ GuidInfo *qmp_query_vm_generation_id(Error **errp) info->guid = qemu_uuid_unparse_strdup(&vms->guid); return info; } + +void qmp_dump_skeys(const char *filename, Error **errp) +{ + CPUState *cpu = first_cpu; /* FIXME */ + + if (!cpu->cc->sysemu_ops->qmp_dump_skeys) { + error_setg(errp, "Storage keys information not available" + " for this architecture"); + return; + } + cpu->cc->sysemu_ops->qmp_dump_skeys(filename, errp); +} diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 686c118ebcd..6bd608b5aa3 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -15,6 +15,7 @@ #include "hw/qdev-properties.h" #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" @@ -219,11 +220,6 @@ out: fclose(f); } -void qmp_dump_skeys(const char *filename, Error **errp) -{ - s390_qmp_dump_skeys(filename, errp); -} - static bool qemu_s390_skeys_are_enabled(S390SKeysState *ss) { QEMUS390SKeysState *skeys = QEMU_S390_SKEYS(ss);
Reduce misc-target.json by one target specific command. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- qapi/machine.json | 18 ++++++++++++++++++ qapi/misc-target.json | 19 ------------------- hw/core/machine-qmp-cmds.c | 13 +++++++++++++ hw/s390x/s390-skeys.c | 6 +----- 4 files changed, 32 insertions(+), 24 deletions(-)