mirror of https://github.com/proxmox/mirror_qemu
s390x: Properly fetch and test the short psw on diag308 subc 0/1
We need to actually fetch the cpu mask and set it. As we invert the short psw indication in the mask, SIE will report a specification exception, if it wasn't present in the reset psw. Signed-off-by: Janosch Frank <frankja@linux.ibm.com> Reviewed-by: David Hildenbrand <david@redhat.com> Message-Id: <20191129142025.21453-2-frankja@linux.ibm.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>master
parent
d0ce53ff2d
commit
104130cb7c
|
@ -76,8 +76,16 @@ static bool s390_cpu_has_work(CPUState *cs)
|
||||||
static void s390_cpu_load_normal(CPUState *s)
|
static void s390_cpu_load_normal(CPUState *s)
|
||||||
{
|
{
|
||||||
S390CPU *cpu = S390_CPU(s);
|
S390CPU *cpu = S390_CPU(s);
|
||||||
cpu->env.psw.addr = ldl_phys(s->as, 4) & PSW_MASK_ESA_ADDR;
|
uint64_t spsw = ldq_phys(s->as, 0);
|
||||||
cpu->env.psw.mask = PSW_MASK_32 | PSW_MASK_64;
|
|
||||||
|
cpu->env.psw.mask = spsw & 0xffffffff80000000ULL;
|
||||||
|
/*
|
||||||
|
* 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 & 0x7fffffffULL;
|
||||||
|
|
||||||
s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu);
|
s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -269,6 +269,7 @@ extern const VMStateDescription vmstate_s390_cpu;
|
||||||
#define PSW_MASK_EXT 0x0100000000000000ULL
|
#define PSW_MASK_EXT 0x0100000000000000ULL
|
||||||
#define PSW_MASK_KEY 0x00F0000000000000ULL
|
#define PSW_MASK_KEY 0x00F0000000000000ULL
|
||||||
#define PSW_SHIFT_KEY 52
|
#define PSW_SHIFT_KEY 52
|
||||||
|
#define PSW_MASK_SHORTPSW 0x0008000000000000ULL
|
||||||
#define PSW_MASK_MCHECK 0x0004000000000000ULL
|
#define PSW_MASK_MCHECK 0x0004000000000000ULL
|
||||||
#define PSW_MASK_WAIT 0x0002000000000000ULL
|
#define PSW_MASK_WAIT 0x0002000000000000ULL
|
||||||
#define PSW_MASK_PSTATE 0x0001000000000000ULL
|
#define PSW_MASK_PSTATE 0x0001000000000000ULL
|
||||||
|
|
Loading…
Reference in New Issue