[PULL,15/20] s390x: protvirt: Handle SIGP store status correctly

Commit Message

Cornelia Huck April 30, 2020, 9:44 a.m. UTC

From: Janosch Frank <[e-mail]>

For protected VMs status storing is not done by QEMU anymore.

Signed-off-by: Janosch Frank <[e-mail]>
Reviewed-by: Thomas Huth <[e-mail]>
Reviewed-by: David Hildenbrand <[e-mail]>
Reviewed-by: Christian Borntraeger <[e-mail]>
Reviewed-by: Claudio Imbrenda <[e-mail]>
Reviewed-by: Cornelia Huck <[e-mail]>
Message-Id: <[e-mail]>
Signed-off-by: Cornelia Huck <[e-mail]>
---
 target/s390x/helper.c | 6 ++++++
 1 file changed, 6 insertions(+)

Patch

diff --git a/target/s390x/helper.c b/target/s390x/helper.c
index ed726849114f..09f60406aa33 100644
--- a/target/s390x/helper.c
+++ b/target/s390x/helper.c
@@ -25,6 +25,7 @@ 
 #include "qemu/timer.h"
 #include "qemu/qemu-print.h"
 #include "hw/s390x/ioinst.h"
+#include "hw/s390x/pv.h"
 #include "sysemu/hw_accel.h"
 #include "sysemu/runstate.h"
 #ifndef CONFIG_USER_ONLY
@@ -246,6 +247,11 @@  int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch)
     hwaddr len = sizeof(*sa);
     int i;
 
+    /* For PVMs storing will occur when this cpu enters SIE again */
+    if (s390_is_pv()) {
+        return 0;
+    }
+
     sa = cpu_physical_memory_map(addr, &len, true);
     if (!sa) {
         return -EFAULT;