diff options
| author | Andreas Färber | 2012-05-03 06:41:02 +0200 |
|---|---|---|
| committer | Andreas Färber | 2012-10-31 01:02:45 +0100 |
| commit | 79bbf20bcaf2ee5d8e3f93a5151d992fc9a5fd89 (patch) | |
| tree | 1d8c27dc0f4cf0a9c5f842af3e4ff2d097436b11 /hw | |
| parent | cpus: Pass CPUState to qemu_wait_io_event_common() (diff) | |
| download | qemu-79bbf20bcaf2ee5d8e3f93a5151d992fc9a5fd89.tar.gz qemu-79bbf20bcaf2ee5d8e3f93a5151d992fc9a5fd89.tar.xz qemu-79bbf20bcaf2ee5d8e3f93a5151d992fc9a5fd89.zip | |
xtensa_pic: Pass XtensaCPU to xtensa_ccompare_cb()
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | 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 653ded6820..8b9c0510f9 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); } } |