42aeb20e68
Update to v5.0.0 OBS-URL: https://build.opensuse.org/request/show/798748 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=547
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From: Janosch Frank <frankja@linux.ibm.com>
|
|
Date: Wed, 5 Feb 2020 07:02:51 -0500
|
|
Subject: s390x: protvirt: Move STSI data over SIDAD
|
|
|
|
References: bsc#1167075
|
|
|
|
For protected guests, we need to put the STSI emulation results into
|
|
the SIDA, so SIE will write them into the guest at the next entry.
|
|
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
|
|
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
|
|
(cherry picked from commit ccce7a654911ae507c962aff5f41004a7a88fad6)
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
target/s390x/kvm.c | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
|
|
index 0e93778ed15d0e04e83eff1baccf..e0b61680ab086a5ff5875c42b7e5 100644
|
|
--- a/target/s390x/kvm.c
|
|
+++ b/target/s390x/kvm.c
|
|
@@ -50,6 +50,7 @@
|
|
#include "exec/memattrs.h"
|
|
#include "hw/s390x/s390-virtio-ccw.h"
|
|
#include "hw/s390x/s390-virtio-hcall.h"
|
|
+#include "hw/s390x/pv.h"
|
|
|
|
#ifndef DEBUG_KVM
|
|
#define DEBUG_KVM 0
|
|
@@ -1808,7 +1809,9 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar)
|
|
SysIB_322 sysib;
|
|
int del, i;
|
|
|
|
- if (s390_cpu_virt_mem_read(cpu, addr, ar, &sysib, sizeof(sysib))) {
|
|
+ if (s390_is_pv()) {
|
|
+ s390_cpu_pv_mem_read(cpu, 0, &sysib, sizeof(sysib));
|
|
+ } else if (s390_cpu_virt_mem_read(cpu, addr, ar, &sysib, sizeof(sysib))) {
|
|
return;
|
|
}
|
|
/* Shift the stack of Extended Names to prepare for our own data */
|
|
@@ -1861,7 +1864,11 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar)
|
|
/* Insert UUID */
|
|
memcpy(sysib.vm[0].uuid, &qemu_uuid, sizeof(sysib.vm[0].uuid));
|
|
|
|
- s390_cpu_virt_mem_write(cpu, addr, ar, &sysib, sizeof(sysib));
|
|
+ if (s390_is_pv()) {
|
|
+ s390_cpu_pv_mem_write(cpu, 0, &sysib, sizeof(sysib));
|
|
+ } else {
|
|
+ s390_cpu_virt_mem_write(cpu, addr, ar, &sysib, sizeof(sysib));
|
|
+ }
|
|
}
|
|
|
|
static int handle_stsi(S390CPU *cpu)
|