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
61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
From: Janosch Frank <frankja@linux.ibm.com>
|
|
Date: Tue, 23 Jul 2019 13:17:32 +0200
|
|
Subject: s390x: protvirt: Set guest IPL PSW
|
|
|
|
Git-commit: e8686d9849f1625f4f4b28403f0555181b72d1b6
|
|
References: bsc#1167075
|
|
|
|
Handling of CPU reset and setting of the IPL psw from guest storage at
|
|
offset 0 is done by a Ultravisor call. Let's only fetch it if
|
|
necessary.
|
|
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.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/cpu.c | 26 +++++++++++++++++---------
|
|
1 file changed, 17 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
|
|
index bb7a588e3b791fe48b4e0a0826dd..f2ccf0a06a0c9c1dde202988ceee 100644
|
|
--- a/target/s390x/cpu.c
|
|
+++ b/target/s390x/cpu.c
|
|
@@ -77,16 +77,24 @@ static bool s390_cpu_has_work(CPUState *cs)
|
|
static void s390_cpu_load_normal(CPUState *s)
|
|
{
|
|
S390CPU *cpu = S390_CPU(s);
|
|
- uint64_t spsw = ldq_phys(s->as, 0);
|
|
-
|
|
- cpu->env.psw.mask = spsw & PSW_MASK_SHORT_CTRL;
|
|
- /*
|
|
- * Invert short psw indication, so SIE will report a specification
|
|
- * exception if it was not set.
|
|
- */
|
|
- cpu->env.psw.mask ^= PSW_MASK_SHORTPSW;
|
|
- cpu->env.psw.addr = spsw & PSW_MASK_SHORT_ADDR;
|
|
+ uint64_t spsw;
|
|
|
|
+ if (!s390_is_pv()) {
|
|
+ spsw = ldq_phys(s->as, 0);
|
|
+ cpu->env.psw.mask = spsw & PSW_MASK_SHORT_CTRL;
|
|
+ /*
|
|
+ * Invert short psw indication, so SIE will report a specification
|
|
+ * exception if it was not set.
|
|
+ */
|
|
+ cpu->env.psw.mask ^= PSW_MASK_SHORTPSW;
|
|
+ cpu->env.psw.addr = spsw & PSW_MASK_SHORT_ADDR;
|
|
+ } else {
|
|
+ /*
|
|
+ * Firmware requires us to set the load state before we set
|
|
+ * the cpu to operating on protected guests.
|
|
+ */
|
|
+ s390_cpu_set_state(S390_CPU_STATE_LOAD, cpu);
|
|
+ }
|
|
s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu);
|
|
}
|
|
#endif
|