Skip to content

Commit

Permalink
xtensa_pic: Pass XtensaCPU to xtensa_ccompare_cb()
Browse files Browse the repository at this point in the history
Needed for changing cpu_has_work() argument type to CPUState.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
  • Loading branch information
afaerber committed Oct 31, 2012
1 parent 509a0d7 commit 79bbf20
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions hw/xtensa_pic.c
Expand Up @@ -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);
Expand All @@ -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);
}
}

Expand Down

0 comments on commit 79bbf20

Please sign in to comment.