[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/11] ppc: Pass PowerPCCPU to [h]decr timer call
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v2 06/11] ppc: Pass PowerPCCPU to [h]decr timer callbacks |
Date: |
Sun, 16 Dec 2012 01:13:32 +0100 |
Cleans up after passing PowerPCCPU to [h]decr exception callbacks.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/ppc.c | 18 ++++++++++--------
1 Datei geändert, 10 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-)
diff --git a/hw/ppc.c b/hw/ppc.c
index b1b93a1..8c05eb3 100644
--- a/hw/ppc.c
+++ b/hw/ppc.c
@@ -714,11 +714,11 @@ void cpu_ppc_store_decr (CPUPPCState *env, uint32_t value)
_cpu_ppc_store_decr(cpu, cpu_ppc_load_decr(env), value, 0);
}
-static void cpu_ppc_decr_cb (void *opaque)
+static void cpu_ppc_decr_cb(void *opaque)
{
- CPUPPCState *env = opaque;
+ PowerPCCPU *cpu = opaque;
- _cpu_ppc_store_decr(ppc_env_get_cpu(env), 0x00000000, 0xFFFFFFFF, 1);
+ _cpu_ppc_store_decr(cpu, 0x00000000, 0xFFFFFFFF, 1);
}
static inline void _cpu_ppc_store_hdecr(PowerPCCPU *cpu, uint32_t hdecr,
@@ -739,11 +739,11 @@ void cpu_ppc_store_hdecr (CPUPPCState *env, uint32_t
value)
_cpu_ppc_store_hdecr(cpu, cpu_ppc_load_hdecr(env), value, 0);
}
-static void cpu_ppc_hdecr_cb (void *opaque)
+static void cpu_ppc_hdecr_cb(void *opaque)
{
- CPUPPCState *env = opaque;
+ PowerPCCPU *cpu = opaque;
- _cpu_ppc_store_hdecr(ppc_env_get_cpu(env), 0x00000000, 0xFFFFFFFF, 1);
+ _cpu_ppc_store_hdecr(cpu, 0x00000000, 0xFFFFFFFF, 1);
}
static void cpu_ppc_store_purr(PowerPCCPU *cpu, uint64_t value)
@@ -774,17 +774,19 @@ static void cpu_ppc_set_tb_clk (void *opaque, uint32_t
freq)
/* Set up (once) timebase frequency (in Hz) */
clk_setup_cb cpu_ppc_tb_init (CPUPPCState *env, uint32_t freq)
{
+ PowerPCCPU *cpu = ppc_env_get_cpu(env);
ppc_tb_t *tb_env;
tb_env = g_malloc0(sizeof(ppc_tb_t));
env->tb_env = tb_env;
tb_env->flags = PPC_DECR_UNDERFLOW_TRIGGERED;
/* Create new timer */
- tb_env->decr_timer = qemu_new_timer_ns(vm_clock, &cpu_ppc_decr_cb, env);
+ tb_env->decr_timer = qemu_new_timer_ns(vm_clock, &cpu_ppc_decr_cb, cpu);
if (0) {
/* XXX: find a suitable condition to enable the hypervisor decrementer
*/
- tb_env->hdecr_timer = qemu_new_timer_ns(vm_clock, &cpu_ppc_hdecr_cb,
env);
+ tb_env->hdecr_timer = qemu_new_timer_ns(vm_clock, &cpu_ppc_hdecr_cb,
+ cpu);
} else {
tb_env->hdecr_timer = NULL;
}
--
1.7.10.4
- [Qemu-devel] [PATCH v2 00/11] QOM CPUState, part 6: CPU_COMMON for KVM, Andreas Färber, 2012/12/15
- [Qemu-devel] [PATCH v2 01/11] cpu: Move kvm_fd into CPUState, Andreas Färber, 2012/12/15
- [Qemu-devel] [PATCH v2 02/11] kvm: Pass CPUState to kvm_arch_*, Andreas Färber, 2012/12/15
- [Qemu-devel] [PATCH v2 05/11] ppc: Pass PowerPCCPU to [h]decr callbacks, Andreas Färber, 2012/12/15
- [Qemu-devel] [PATCH v2 04/11] ppc: Pass PowerPCCPU to ppc_set_irq(), Andreas Färber, 2012/12/15
- [Qemu-devel] [PATCH v2 06/11] ppc: Pass PowerPCCPU to [h]decr timer callbacks,
Andreas Färber <=
- [Qemu-devel] [PATCH v2 07/11] ppc_booke: Pass PowerPCCPU to {decr, fit, wdt} timer callbacks, Andreas Färber, 2012/12/15
- [Qemu-devel] [PATCH v2 08/11] ppc4xx_devs: Return PowerPCCPU from ppc4xx_init(), Andreas Färber, 2012/12/15
- [Qemu-devel] [PATCH v2 03/11] kvm: Pass CPUState to kvm_vcpu_ioctl(), Andreas Färber, 2012/12/15
- [Qemu-devel] [PATCH v2 11/11] cpu: Move kvm_run into CPUState, Andreas Färber, 2012/12/15
- [Qemu-devel] [PATCH v2 10/11] cpu: Move kvm_state field into CPUState, Andreas Färber, 2012/12/15
- [Qemu-devel] [PATCH v2 09/11] ppc_booke: Pass PowerPCCPU to ppc_booke_timers_init(), Andreas Färber, 2012/12/15
- Re: [Qemu-devel] [PATCH v2 00/11] QOM CPUState, part 6: CPU_COMMON for KVM, Andreas Färber, 2012/12/18