ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Andreas Färber 2012-05-03 06:41:02 +02:00
parent 509a0d78c7
commit 79bbf20bca
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xtensa_pic.c
View File

@ -125,7 +125,8 @@ void xtensa_rearm_ccompare_timer(CPUXtensaState *env)
static void xtensa_ccompare_cb(void *opaque) static void xtensa_ccompare_cb(void *opaque)
{ {
CPUXtensaState *env = opaque; XtensaCPU *cpu = opaque;
CPUXtensaState *env = &cpu->env;
if (env->halted) { if (env->halted) {
env->halt_clock = qemu_get_clock_ns(vm_clock); 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) void xtensa_irq_init(CPUXtensaState *env)
{ {
XtensaCPU *cpu = xtensa_env_get_cpu(env);
env->irq_inputs = (void **)qemu_allocate_irqs( env->irq_inputs = (void **)qemu_allocate_irqs(
xtensa_set_irq, env, env->config->ninterrupt); xtensa_set_irq, env, env->config->ninterrupt);
if (xtensa_option_enabled(env->config, XTENSA_OPTION_TIMER_INTERRUPT) && if (xtensa_option_enabled(env->config, XTENSA_OPTION_TIMER_INTERRUPT) &&
env->config->nccompare > 0) { env->config->nccompare > 0) {
env->ccompare_timer = env->ccompare_timer =
qemu_new_timer_ns(vm_clock, &xtensa_ccompare_cb, env); qemu_new_timer_ns(vm_clock, &xtensa_ccompare_cb, cpu);
} }
} }