1f88dea66c
- Updating to Sphinx v3.1.2 in Factory is exposing an issue in qemu doc sources. Fix it docs-fix-trace-docs-build-with-sphinx-3..patch - Fix DoS possibility in ati-vga emulation (CVE-2020-13800 bsc#1172495) ati-vga-check-mm_index-before-recursive-.patch - Fix DoS possibility in Network Block Device (nbd) support infrastructure (CVE-2020-10761 bsc#1172710) nbd-server-Avoid-long-error-message-asse.patch - Fix null pointer dereference possibility (DoS) in MegaRAID SAS 8708EM2 emulation (CVE-2020-13659 bsc#1172386) exec-set-map-length-to-zero-when-returni.patch - Fix OOB access possibility in MegaRAID SAS 8708EM2 emulation (CVE-2020-13362 bsc#1172383) megasas-use-unsigned-type-for-reply_queu.patch - Fix legacy IGD passthrough hw-vfio-pci-quirks-Fix-broken-legacy-IGD.patch - The latest gcc10 available in Factory has the fix for the issue this patch was created to avoid, so drop it build-Work-around-gcc10-bug-by-not-using.patch - Switch to upstream versions of some patches we carry add-enum-cast-to-avoid-gcc10-warning.patch -> golan-Add-explicit-type-casts-for-nodnic.patch Be-explicit-about-fcommon-compiler-direc.patch -> build-Be-explicit-about-fcommon-compiler.patch Do-not-apply-WORKAROUND_CFLAGS-for-host-.patch -> build-Do-not-apply-WORKAROUND_CFLAGS-for.patch Fix-s-directive-argument-is-null-error.patch -> build-Fix-s-directive-argument-is-null-e.patch Workaround-compilation-error-with-gcc-9..patch -> build-Workaround-compilation-error-with-.patch work-around-gcc10-problem-with-zero-leng.patch -> intel-Avoid-spurious-compiler-warning-on.patch - Fix vgabios issue for cirrus graphics emulation, which effectively downgraded it to standard VGA behavior vga-fix-cirrus-bios.patch - Fix OOB access possibility in ES1370 audio device emulation (CVE-2020-13361 bsc#1172384) es1370-check-total-frame-count-against-c.patch OBS-URL: https://build.opensuse.org/request/show/822154 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=553
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
|
|
|
|
Git-commit: ccce7a654911ae507c962aff5f41004a7a88fad6
|
|
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>
|
|
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)
|