diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2013-03-15 10:57:40 +0100 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2013-03-17 20:01:31 +0000 |
| commit | 225dc991b03f0f034aa348f5cf499de9d0979107 (patch) | |
| tree | 4b9027b8e2c34157fc01a8b90c4c84747982f567 | |
| parent | 7fb7377594887db99a2100adcddf3bd6394ef540 (diff) | |
| download | focaccia-qemu-225dc991b03f0f034aa348f5cf499de9d0979107.tar.gz focaccia-qemu-225dc991b03f0f034aa348f5cf499de9d0979107.zip | |
s390: Fix cpu refactoring fallout.
Commit 259186a7 "cpu: Move halted and interrupt_request fields to CPUState" seems to have missed one instance in target-s390x/kvm.c: /home/cohuck/git/qemu/target-s390x/kvm.c: In function ‘kvm_arch_process_async_events’: /home/cohuck/git/qemu/target-s390x/kvm.c:319: error: ‘CPUS390XState’ has no member named ‘halted’ /home/cohuck/git/qemu/target-s390x/kvm.c:320: warning: control reaches end of non-void function make[1]: *** [target-s390x/kvm.o] Error 1 Let's just switch to cs->halted. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Acked-by: Alexander Graf <agraf@suse.de> Acked-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | target-s390x/kvm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 8f111ae732..644f484c48 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -315,8 +315,7 @@ void kvm_arch_post_run(CPUState *cpu, struct kvm_run *run) int kvm_arch_process_async_events(CPUState *cs) { - S390CPU *cpu = S390_CPU(cs); - return cpu->env.halted; + return cs->halted; } void kvm_s390_interrupt_internal(S390CPU *cpu, int type, uint32_t parm, |