Re: [Qemu-devel] [PATCH] s390: Fix cpu refactoring fallout.

[Alexander Graf]

On 15.03.2013, at 10:57, Cornelia Huck wrote:

> 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 <address@hidden>

Acked-by: Alexander Graf <address@hidden>

Blue, I'd appreciate if you could just apply this one directly :)


Alex

> ---
> target-s390x/kvm.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
> index 8f111ae..644f484 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,
> -- 
> 1.7.12.4
>