diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-05-27 05:17:50 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-07-09 21:20:28 +0200 |
| commit | 4917cf44326a1bda2fd7f27303aff7a25ad86518 (patch) | |
| tree | d9c153504b0806990d0c5646c886e16150835d1a /hw/timer/arm_mptimer.c | |
| parent | 80b7cd735417b0883a026d79a513629a2817cdb4 (diff) | |
| download | focaccia-qemu-4917cf44326a1bda2fd7f27303aff7a25ad86518.tar.gz focaccia-qemu-4917cf44326a1bda2fd7f27303aff7a25ad86518.zip | |
cpu: Replace cpu_single_env with CPUState current_cpu
Move it to qom/cpu.h. Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/timer/arm_mptimer.c')
| -rw-r--r-- | hw/timer/arm_mptimer.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index d23462d00e..fbc69c94b7 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -49,13 +49,11 @@ typedef struct { static inline int get_current_cpu(ARMMPTimerState *s) { - CPUState *cpu_single_cpu = ENV_GET_CPU(cpu_single_env); - - if (cpu_single_cpu->cpu_index >= s->num_cpu) { + if (current_cpu->cpu_index >= s->num_cpu) { hw_error("arm_mptimer: num-cpu %d but this cpu is %d!\n", - s->num_cpu, cpu_single_cpu->cpu_index); + s->num_cpu, current_cpu->cpu_index); } - return cpu_single_cpu->cpu_index; + return current_cpu->cpu_index; } static inline void timerblock_update_irq(TimerBlock *tb) |