| Message ID | 1415103708-115450-2-git-send-email-agraf@suse.de |
|---|---|
| State | New |
| Headers | show |
On 11/04/2014 12:21 PM, Alexander Graf wrote: > When injecting an sclp console interrupt into the guest, we increase > the PC by 4 for some reason. I have no idea why I put that code there, > but it's clearly wrong. Remove the increment. > > This patch fixes sclp serial input for the ccw machine. > > Signed-off-by: Alexander Graf <agraf@suse.de> > --- > target-s390x/interrupt.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/target-s390x/interrupt.c b/target-s390x/interrupt.c > index 23a9114..1404d0a 100644 > --- a/target-s390x/interrupt.c > +++ b/target-s390x/interrupt.c > @@ -22,9 +22,7 @@ void s390_sclp_extint(uint32_t parm) > kvm_s390_service_interrupt(parm); > } else { > S390CPU *dummy_cpu = s390_cpu_addr2state(0); > - CPUS390XState *env = &dummy_cpu->env; > > - env->psw.addr += 4; > cpu_inject_ext(dummy_cpu, EXT_SERVICE, parm, 0); > } > } Reviewed-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
diff --git a/target-s390x/interrupt.c b/target-s390x/interrupt.c index 23a9114..1404d0a 100644 --- a/target-s390x/interrupt.c +++ b/target-s390x/interrupt.c @@ -22,9 +22,7 @@ void s390_sclp_extint(uint32_t parm) kvm_s390_service_interrupt(parm); } else { S390CPU *dummy_cpu = s390_cpu_addr2state(0); - CPUS390XState *env = &dummy_cpu->env; - env->psw.addr += 4; cpu_inject_ext(dummy_cpu, EXT_SERVICE, parm, 0); } }
When injecting an sclp console interrupt into the guest, we increase the PC by 4 for some reason. I have no idea why I put that code there, but it's clearly wrong. Remove the increment. This patch fixes sclp serial input for the ccw machine. Signed-off-by: Alexander Graf <agraf@suse.de> --- target-s390x/interrupt.c | 2 -- 1 file changed, 2 deletions(-)