[PATCH 2/4] hw/s390x: Introduce the 'dump_s390_skeys' HMP command

[Philippe Mathieu-Daudé]

'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>
---
 include/monitor/hmp.h      |  1 +
 hw/s390x/s390-skeys-stub.c |  8 ++++++++
 hw/s390x/s390-skeys.c      |  9 ++++++++-
 hmp-commands.hx            | 13 +++++++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index 954f3c83ad..647a1e4a3f 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -181,5 +181,6 @@ void hmp_boot_set(Monitor *mon, const QDict *qdict);
 void hmp_info_mtree(Monitor *mon, const QDict *qdict);
 void hmp_info_cryptodev(Monitor *mon, const QDict *qdict);
 void hmp_dumpdtb(Monitor *mon, const QDict *qdict);
+void hmp_dump_s390_skeys(Monitor *mon, const QDict *qdict);
 
 #endif
diff --git a/hw/s390x/s390-skeys-stub.c b/hw/s390x/s390-skeys-stub.c
index 50b5f83437..94b491425b 100644
--- a/hw/s390x/s390-skeys-stub.c
+++ b/hw/s390x/s390-skeys-stub.c
@@ -8,6 +8,14 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-misc.h"
+#include "monitor/monitor.h"
+#include "monitor/hmp.h"
+
+void hmp_dump_s390_skeys(Monitor *mon, const QDict *qdict)
+{
+    monitor_printf(mon, "This guest is not using s390 storage keys - "
+                     "nothing to dump\n");
+}
 
 void qmp_dump_s390_skeys(const char *filename, Error **errp)
 {
diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c
index f9bb08eb92..e7dab52a6e 100644
--- a/hw/s390x/s390-skeys.c
+++ b/hw/s390x/s390-skeys.c
@@ -24,6 +24,8 @@
 #include "sysemu/kvm.h"
 #include "migration/qemu-file-types.h"
 #include "migration/register.h"
+#include "monitor/monitor.h"
+#include "monitor/hmp.h"
 
 #define S390_SKEYS_BUFFER_SIZE (128 * KiB)  /* Room for 128k storage keys */
 #define S390_SKEYS_SAVE_FLAG_EOS 0x01
@@ -105,7 +107,7 @@ void hmp_info_skeys(Monitor *mon, const QDict *qdict)
     monitor_printf(mon, "  key: 0x%X\n", key);
 }
 
-void hmp_dump_skeys(Monitor *mon, const QDict *qdict)
+void hmp_dump_s390_skeys(Monitor *mon, const QDict *qdict)
 {
     const char *filename = qdict_get_str(qdict, "filename");
     Error *err = NULL;
@@ -116,6 +118,11 @@ void hmp_dump_skeys(Monitor *mon, const QDict *qdict)
     }
 }
 
+void hmp_dump_skeys(Monitor *mon, const QDict *qdict)
+{
+    hmp_dump_s390_skeys(mon, qdict);
+}
+
 void qmp_dump_s390_skeys(const char *filename, Error **errp)
 {
     S390SKeysState *ss = s390_get_skeys_device();
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 06746f0afc..c12e2c2bd9 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1120,6 +1120,19 @@ SRST
 
 ERST
 
+    {
+        .name       = "dump-s390-skeys",
+        .args_type  = "filename:F",
+        .params     = "",
+        .help       = "Save guest storage keys into file 'filename'.",
+        .cmd        = hmp_dump_s390_skeys,
+    },
+
+SRST
+``dump-s390-skeys`` *filename*
+  Save guest storage keys to a file.
+ERST
+
 #if defined(TARGET_S390X)
     {
         .name       = "dump-skeys",
-- 
2.41.0