Merge remote-tracking branch 'remotes/vivier/tags/q800-for-6.0-pull-request' into...

[qemu.git] / target / s390x / machine.c

diff --git a/target/s390x/machine.c b/target/s390x/machine.c
index 1e9526e937623897fe688c0fff7099ce57d5571d..5b4e82f1ab99b0371bf29bfe9e9524152dfe7029 100644 (file)
--- a/target/s390x/machine.c
+++ b/target/s390x/machine.c
@@ -15,10 +15,10 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "cpu.h"
 #include "internal.h"
 #include "kvm_s390x.h"
+#include "migration/vmstate.h"
 #include "tcg_s390x.h"
 #include "sysemu/kvm.h"
 #include "sysemu/tcg.h"
@@ -234,6 +234,22 @@ const VMStateDescription vmstate_etoken = {
     }
 };
 
+static bool diag318_needed(void *opaque)
+{
+    return s390_has_feat(S390_FEAT_DIAG_318);
+}
+
+const VMStateDescription vmstate_diag318 = {
+    .name = "cpu/diag318",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .needed = diag318_needed,
+    .fields = (VMStateField[]) {
+        VMSTATE_UINT64(env.diag318_info, S390CPU),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
 const VMStateDescription vmstate_s390_cpu = {
     .name = "cpu",
     .post_load = cpu_post_load,
@@ -270,6 +286,7 @@ const VMStateDescription vmstate_s390_cpu = {
         &vmstate_gscb,
         &vmstate_bpbc,
         &vmstate_etoken,
+        &vmstate_diag318,
         NULL
     },
 };