[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/74] arm_boot: Pass ARMCPU to do_cpu_reset()
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 06/74] arm_boot: Pass ARMCPU to do_cpu_reset() |
Date: |
Tue, 5 Jun 2012 03:21:38 +0200 |
Allows us to use cpu_reset() in place of cpu_state_reset().
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Peter Maydell <address@hidden>
---
hw/arm_boot.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index 7447f5c..eb2d176 100644
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -274,10 +274,11 @@ static int load_dtb(target_phys_addr_t addr, const struct
arm_boot_info *binfo)
static void do_cpu_reset(void *opaque)
{
- CPUARMState *env = opaque;
+ ARMCPU *cpu = opaque;
+ CPUARMState *env = &cpu->env;
const struct arm_boot_info *info = env->boot_info;
- cpu_state_reset(env);
+ cpu_reset(CPU(cpu));
if (info) {
if (!info->is_linux) {
/* Jump to the entry point. */
@@ -302,6 +303,7 @@ static void do_cpu_reset(void *opaque)
void arm_load_kernel(CPUARMState *env, struct arm_boot_info *info)
{
+ ARMCPU *cpu;
int kernel_size;
int initrd_size;
int n;
@@ -406,7 +408,8 @@ void arm_load_kernel(CPUARMState *env, struct arm_boot_info
*info)
info->is_linux = is_linux;
for (; env; env = env->next_cpu) {
+ cpu = arm_env_get_cpu(env);
env->boot_info = info;
- qemu_register_reset(do_cpu_reset, env);
+ qemu_register_reset(do_cpu_reset, cpu);
}
}
--
1.7.7
- [Qemu-devel] [PULL] QOM CPUState, part 3: cpu_state_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 02/74] pxa2xx: Use cpu_arm_init() and store ARMCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 01/74] target-arm: Use cpu_reset() in cpu_arm_init(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 04/74] armv7m: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 05/74] armv7m: Pass ARMCPU to armv7m_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 06/74] arm_boot: Pass ARMCPU to do_cpu_reset(),
Andreas Färber <=
- [Qemu-devel] [PATCH 03/74] omap: Use cpu_arm_init() to store ARMCPU in omap_mpu_state_s, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 07/74] target-lm32: Let cpu_lm32_init() return LM32CPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 08/74] lm32_boards: Use cpu_lm32_init() to obtain LM32CPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 09/74] lm32_boards: Store LM32CPU in ResetInfo, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 10/74] milkymist: Use cpu_lm32_init() to obtain LM32CPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 11/74] milkymist: Store LM32 in ResetInfo, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 12/74] target-xtensa: Let cpu_xtensa_init() return XtensaCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 15/74] xtensa_lx60: Use cpu_xtensa_init() to obtain XtensaCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 14/74] xtensa_sim: Pass XtensaCPU to sim_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 19/74] axis_dev88: Use cpu_cris_init() to obtain CRISCPU, Andreas Färber, 2012/06/04