* Re: [Qemu-devel] [PATCH] s390: Fix cpu refactoring fallout.
2013-03-15 9:57 [Qemu-devel] [PATCH] s390: Fix cpu refactoring fallout Cornelia Huck
@ 2013-03-15 12:13 ` Alexander Graf
2013-03-15 17:25 ` Andreas Färber
2013-03-17 20:49 ` Blue Swirl
2 siblings, 0 replies; 4+ messages in thread
From: Alexander Graf @ 2013-03-15 12:13 UTC (permalink / raw)
To: Cornelia Huck; +Cc: Blue Swirl, Andreas Färber, qemu-devel qemu-devel
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 <cornelia.huck@de.ibm.com>
Acked-by: Alexander Graf <agraf@suse.de>
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
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] s390: Fix cpu refactoring fallout.
2013-03-15 9:57 [Qemu-devel] [PATCH] s390: Fix cpu refactoring fallout Cornelia Huck
2013-03-15 12:13 ` Alexander Graf
@ 2013-03-15 17:25 ` Andreas Färber
2013-03-17 20:49 ` Blue Swirl
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Färber @ 2013-03-15 17:25 UTC (permalink / raw)
To: Cornelia Huck; +Cc: Alexander Graf, qemu-devel
Am 15.03.2013 10:57, schrieb Cornelia Huck:
> 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>
> ---
> target-s390x/kvm.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
I definitely compile-tested qom-cpu on s390x before submitting my pull,
so this looks like a merge conflict to me...
Acked-by: Andreas Färber <afaerber@suse.de>
Andreas
>
> 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,
>
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] s390: Fix cpu refactoring fallout.
2013-03-15 9:57 [Qemu-devel] [PATCH] s390: Fix cpu refactoring fallout Cornelia Huck
2013-03-15 12:13 ` Alexander Graf
2013-03-15 17:25 ` Andreas Färber
@ 2013-03-17 20:49 ` Blue Swirl
2 siblings, 0 replies; 4+ messages in thread
From: Blue Swirl @ 2013-03-17 20:49 UTC (permalink / raw)
To: Cornelia Huck; +Cc: qemu-devel, Andreas Färber, Alexander Graf
Thanks, applied.
On Fri, Mar 15, 2013 at 9:57 AM, Cornelia Huck <cornelia.huck@de.ibm.com> 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 <cornelia.huck@de.ibm.com>
> ---
> 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
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread