| Message ID | 20191129094809.26684-14-frankja@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x: Protected Virtualization support | expand |
On 29/11/2019 10.48, Janosch Frank wrote: > Status storing is obviously not done by qemu anymore. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > --- > target/s390x/helper.c | 4 ++++ > target/s390x/sigp.c | 1 + > 2 files changed, 5 insertions(+) > > diff --git a/target/s390x/helper.c b/target/s390x/helper.c > index a3a49164e4..3800c4b395 100644 > --- a/target/s390x/helper.c > +++ b/target/s390x/helper.c > @@ -246,6 +246,10 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch) > hwaddr len = sizeof(*sa); > int i; > > + if (cpu->env.pv) { > + return 0; > + } > + > sa = cpu_physical_memory_map(addr, &len, 1); > if (!sa) { > return -EFAULT; > diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c > index 727875bb4a..2007946299 100644 > --- a/target/s390x/sigp.c > +++ b/target/s390x/sigp.c > @@ -497,6 +497,7 @@ void do_stop_interrupt(CPUS390XState *env) > if (s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu) == 0) { > qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); > } > + /* Storing will occur on next SIE entry for fmt 4 */ > if (cpu->env.sigp_order == SIGP_STOP_STORE_STATUS) { > s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true); > } > I'd suggest to move the comment to the if-statement in helper.c, too. Thomas
On 29.11.19 12:04, Thomas Huth wrote: > On 29/11/2019 10.48, Janosch Frank wrote: >> Status storing is obviously not done by qemu anymore. >> >> Signed-off-by: Janosch Frank <frankja@linux.ibm.com> >> --- >> target/s390x/helper.c | 4 ++++ >> target/s390x/sigp.c | 1 + >> 2 files changed, 5 insertions(+) >> >> diff --git a/target/s390x/helper.c b/target/s390x/helper.c >> index a3a49164e4..3800c4b395 100644 >> --- a/target/s390x/helper.c >> +++ b/target/s390x/helper.c >> @@ -246,6 +246,10 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch) >> hwaddr len = sizeof(*sa); >> int i; >> >> + if (cpu->env.pv) { >> + return 0; >> + } >> + >> sa = cpu_physical_memory_map(addr, &len, 1); >> if (!sa) { >> return -EFAULT; >> diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c >> index 727875bb4a..2007946299 100644 >> --- a/target/s390x/sigp.c >> +++ b/target/s390x/sigp.c >> @@ -497,6 +497,7 @@ void do_stop_interrupt(CPUS390XState *env) >> if (s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu) == 0) { >> qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); >> } >> + /* Storing will occur on next SIE entry for fmt 4 */ >> if (cpu->env.sigp_order == SIGP_STOP_STORE_STATUS) { >> s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true); >> } >> > > I'd suggest to move the comment to the if-statement in helper.c, too. > +1 > Thomas >
diff --git a/target/s390x/helper.c b/target/s390x/helper.c index a3a49164e4..3800c4b395 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -246,6 +246,10 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch) hwaddr len = sizeof(*sa); int i; + if (cpu->env.pv) { + return 0; + } + sa = cpu_physical_memory_map(addr, &len, 1); if (!sa) { return -EFAULT; diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c index 727875bb4a..2007946299 100644 --- a/target/s390x/sigp.c +++ b/target/s390x/sigp.c @@ -497,6 +497,7 @@ void do_stop_interrupt(CPUS390XState *env) if (s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu) == 0) { qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); } + /* Storing will occur on next SIE entry for fmt 4 */ if (cpu->env.sigp_order == SIGP_STOP_STORE_STATUS) { s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true); }
Status storing is obviously not done by qemu anymore. Signed-off-by: Janosch Frank <frankja@linux.ibm.com> --- target/s390x/helper.c | 4 ++++ target/s390x/sigp.c | 1 + 2 files changed, 5 insertions(+)