[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-next 49/74] xtensa_lx60: Use cpu_xtensa_init() t
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-next 49/74] xtensa_lx60: Use cpu_xtensa_init() to obtain XtensaCPU |
Date: |
Sun, 6 May 2012 17:34:49 +0200 |
Allows us to use cpu_reset() in place of cpu_state_reset().
Signed-off-by: Andreas Färber <address@hidden>
---
hw/xtensa_lx60.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index afdef49..31f8adc 100644
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -164,6 +164,7 @@ static void lx_init(const LxBoardDesc *board,
int be = 0;
#endif
MemoryRegion *system_memory = get_system_memory();
+ XtensaCPU *cpu = NULL;
CPUXtensaState *env = NULL;
MemoryRegion *ram, *rom, *system_io;
DriveInfo *dinfo;
@@ -175,17 +176,19 @@ static void lx_init(const LxBoardDesc *board,
}
for (n = 0; n < smp_cpus; n++) {
- env = cpu_init(cpu_model);
- if (!env) {
+ cpu = cpu_xtensa_init(cpu_model);
+ if (cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
}
+ env = &cpu->env;
+
env->sregs[PRID] = n;
qemu_register_reset(lx60_reset, env);
/* Need MMU initialized prior to ELF loading,
* so that ELF gets loaded into virtual addresses
*/
- cpu_state_reset(env);
+ cpu_reset(CPU(cpu));
}
ram = g_malloc(sizeof(*ram));
--
1.7.7
- [Qemu-devel] [PATCH for-next 52/74] target-cris: Let cpu_cris_init() return CRISCPU, (continued)
- [Qemu-devel] [PATCH for-next 52/74] target-cris: Let cpu_cris_init() return CRISCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 51/74] target-cris: Reindent cpu_cris_init(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 43/74] lm32_boards: Store LM32CPU in ResetInfo, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 55/74] cris-boot: Pass CRISCPU to main_cpu_reset()., Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 60/74] target-mips: Use cpu_reset() in do_interrupt(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 57/74] petalogix_ml605: Use cpu_mb_init() to obtain MicroBlazeCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 56/74] target-microblaze: Let cpu_mb_init() return MicroBlazeCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 62/74] mips_fulong2e: Use cpu_mips_cpu() to obtain MIPSCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 61/74] target-mips: Let cpu_mips_init() return MIPSCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 54/74] cris-boot: Pass CRISCPU to cris_load_image(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 49/74] xtensa_lx60: Use cpu_xtensa_init() to obtain XtensaCPU,
Andreas Färber <=
- [Qemu-devel] [PATCH for-next 66/74] mips_malta: Use cpu_mips_init() to obtain MIPSCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 59/74] microblaze_boot: Pass MicroBlazeCPU to microblaze_load_kernel(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 65/74] mips_jazz: Pass MIPSCPU to main_cpu_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 67/74] mips_malta: Pass MIPSCPU to main_cpu_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 68/74] mips_mipssim: Use cpu_mips_init() to obtain MIPSCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 71/74] mips_r4k: Store MIPSCPU in ResetData, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 58/74] petalogix_s3adsp1800_mmu: Use cpu_mb_init() to obtain MicroBlazeCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 69/74] mips_mipssim: Store MIPSCPU in ResetData, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 64/74] mips_jazz: Use cpu_mips_init() to obtain MIPSCPU, Andreas Färber, 2012/05/06