Re: [Qemu-devel] [PATCH qom-next 42/59] xtensa_pic: Pass XtensaCPU to xtensa_ccompare_cb()

[Andreas Färber]

Am 23.05.2012 05:08, schrieb Andreas Färber:
> Needed for cpu_has_work().
> 
> Signed-off-by: Andreas Färber <address@hidden>

Max, could you ack this trivial patch please? It still applies.

I notice that you were originally not cc'ed: Probably this file was/is
not yet documented in MAINTAINERS.

Thanks,
Andreas

> ---
>  hw/xtensa_pic.c |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/xtensa_pic.c b/hw/xtensa_pic.c
> index 653ded6..8b9c051 100644
> --- a/hw/xtensa_pic.c
> +++ b/hw/xtensa_pic.c
> @@ -125,7 +125,8 @@ void xtensa_rearm_ccompare_timer(CPUXtensaState *env)
>  
>  static void xtensa_ccompare_cb(void *opaque)
>  {
> -    CPUXtensaState *env = opaque;
> +    XtensaCPU *cpu = opaque;
> +    CPUXtensaState *env = &cpu->env;
>  
>      if (env->halted) {
>          env->halt_clock = qemu_get_clock_ns(vm_clock);
> @@ -139,12 +140,14 @@ static void xtensa_ccompare_cb(void *opaque)
>  
>  void xtensa_irq_init(CPUXtensaState *env)
>  {
> +    XtensaCPU *cpu = xtensa_env_get_cpu(env);
> +
>      env->irq_inputs = (void **)qemu_allocate_irqs(
>              xtensa_set_irq, env, env->config->ninterrupt);
>      if (xtensa_option_enabled(env->config, XTENSA_OPTION_TIMER_INTERRUPT) &&
>              env->config->nccompare > 0) {
>          env->ccompare_timer =
> -            qemu_new_timer_ns(vm_clock, &xtensa_ccompare_cb, env);
> +            qemu_new_timer_ns(vm_clock, &xtensa_ccompare_cb, cpu);
>      }
>  }
>  

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg