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
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
|
|
|
|
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>
|
|
(cherry picked from commit e8686d9849f1625f4f4b28403f0555181b72d1b6)
|
|
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
|