From: Cornelia Huck Date: Fri, 15 Mar 2013 09:57:40 +0000 (+0100) Subject: s390: Fix cpu refactoring fallout. X-Git-Tag: v1.5.0-rc0~448^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=225dc991b03f0f034aa348f5cf499de9d0979107;p=thirdparty%2Fqemu.git 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 Acked-by: Alexander Graf Acked-by: Andreas Färber Signed-off-by: Blue Swirl --- diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 8f111ae732d..644f484c487 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,