[PATCH 1/4] hw/s390x: Introduce the @dump-s390-skeys QMP command

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

@dump-skeys is specific to the qemu-system-s390x binary.
In order to provide it in an unified single binary, add
a equivalent new command named @dump-s390-skeys, which
works identically on s390x and reports an error on other
targets.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 qapi/misc.json             | 18 ++++++++++++++++++
 hw/s390x/s390-skeys-stub.c | 16 ++++++++++++++++
 hw/s390x/s390-skeys.c      |  8 +++++++-
 hw/s390x/meson.build       |  5 +++++
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 hw/s390x/s390-skeys-stub.c

diff --git a/qapi/misc.json b/qapi/misc.json
index ec30e5c570..d192dd1bef 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -605,3 +605,21 @@
 { 'event': 'VFU_CLIENT_HANGUP',
   'data': { 'vfu-id': 'str', 'vfu-qom-path': 'str',
             'dev-id': 'str', 'dev-qom-path': 'str' } }
+
+##
+# @dump-s390-skeys:
+#
+# Dump guest's storage keys
+#
+# @filename: the path to the file to dump to
+#
+# Since: 9.1
+#
+# Example:
+#
+#     -> { "execute": "dump-skeys",
+#          "arguments": { "filename": "/tmp/skeys" } }
+#     <- { "return": {} }
+##
+{ 'command': 'dump-s390-skeys',
+  'data': { 'filename': 'str' } }
diff --git a/hw/s390x/s390-skeys-stub.c b/hw/s390x/s390-skeys-stub.c
new file mode 100644
index 0000000000..50b5f83437
--- /dev/null
+++ b/hw/s390x/s390-skeys-stub.c
@@ -0,0 +1,16 @@
+/*
+ * s390 storage key device stubs
+ *
+ * SPDX-FileContributor: Philippe Mathieu-Daudé <philmd@linaro.org>
+ * SPDX-FileCopyrightText: 2023 Linaro Ltd.
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-misc.h"
+
+void qmp_dump_s390_skeys(const char *filename, Error **errp)
+{
+    error_setg(errp, "This guest is not using s390 storage keys - "
+                     "nothing to dump");
+}
diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c
index 5c535d483e..f9bb08eb92 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-misc.h"
 #include "qapi/qapi-commands-misc-target.h"
 #include "qapi/qmp/qdict.h"
 #include "qemu/error-report.h"
@@ -115,7 +116,7 @@ void hmp_dump_skeys(Monitor *mon, const QDict *qdict)
     }
 }
 
-void qmp_dump_skeys(const char *filename, Error **errp)
+void qmp_dump_s390_skeys(const char *filename, Error **errp)
 {
     S390SKeysState *ss = s390_get_skeys_device();
     S390SKeysClass *skeyclass = S390_SKEYS_GET_CLASS(ss);
@@ -192,6 +193,11 @@ out:
     fclose(f);
 }
 
+void qmp_dump_skeys(const char *filename, Error **errp)
+{
+    qmp_dump_s390_skeys(filename, errp);
+}
+
 static bool qemu_s390_skeys_are_enabled(S390SKeysState *ss)
 {
     QEMUS390SKeysState *skeys = QEMU_S390_SKEYS(ss);
diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build
index 482fd13420..c94b8d819d 100644
--- a/hw/s390x/meson.build
+++ b/hw/s390x/meson.build
@@ -50,6 +50,11 @@ virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-ccw.c'))
 virtio_ss.add(when: 'CONFIG_VHOST_USER_FS', if_true: files('vhost-user-fs-ccw.c'))
 s390x_ss.add_all(when: 'CONFIG_VIRTIO_CCW', if_true: virtio_ss)
 
+s390x_stub_ss = ss.source_set()
+s390x_stub_ss.add(when: 'TARGET_S390X', if_false: files('s390-skeys-stub.c'))
+
+specific_ss.add_all(s390x_stub_ss)
+
 hw_arch += {'s390x': s390x_ss}
 
 hw_s390x_modules = {}
-- 
2.41.0