[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/35] xtensa_pic: Pass XtensaCPU to xtensa_ccompare
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 24/35] xtensa_pic: Pass XtensaCPU to xtensa_ccompare_cb() |
Date: |
Wed, 31 Oct 2012 01:59:55 +0100 |
Needed for changing cpu_has_work() argument type to CPUState.
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Max Filippov <address@hidden>
---
hw/xtensa_pic.c | 7 +++++--
1 Datei geändert, 5 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
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);
}
}
--
1.7.10.4
- [Qemu-devel] [PATCH 11/35] ppce500_spin: Store PowerPCCPU in SpinKick, (continued)
- [Qemu-devel] [PATCH 11/35] ppce500_spin: Store PowerPCCPU in SpinKick, Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 05/35] apic: Store X86CPU in APICCommonState, Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 18/35] ppc: Pass PowerPCCPU to {ppc6xx, ppc970, power7, ppc40x, ppce500}_set_irq(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 10/35] cpu: Move stop field to CPUState, Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 12/35] cpu: Move stopped field to CPUState, Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 23/35] cpus: Pass CPUState to qemu_wait_io_event_common(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 17/35] cpus: Pass CPUState to qemu_tcg_init_vcpu(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 22/35] cpus: Pass CPUState to flush_queued_work(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 21/35] cpu: Move queued_work_{first, last} to CPUState, Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 19/35] target-ppc: Rename kvm_kick_{env => cpu} and pass PowerPCCPU, Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 24/35] xtensa_pic: Pass XtensaCPU to xtensa_ccompare_cb(),
Andreas Färber <=
- [Qemu-devel] [PATCH 26/35] target-ppc: Pass PowerPCCPU to cpu_ppc_hypercall, Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 20/35] cpus: Pass CPUState to qemu_cpu_kick(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 25/35] target-ppc: Pass PowerPCCPU to powerpc_excp(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 27/35] spapr: Pass PowerPCCPU to spapr_hypercall(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 28/35] spapr: Pass PowerPCCPU to hypercalls, Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 30/35] target-i386: Pass X86CPU to kvm_mce_inject(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 29/35] cpus: Pass CPUState to [qemu_]cpu_has_work(), Andreas Färber, 2012/10/30