[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH next v2 23/74] ppc_newworld: Use cpu_ppc_init() to obt
From: |
Andreas Färber |
Subject: |
[Qemu-ppc] [PATCH next v2 23/74] ppc_newworld: Use cpu_ppc_init() to obtain PowerPCCPU |
Date: |
Thu, 10 May 2012 02:14:01 +0200 |
Needed for ppc_core99_reset().
Signed-off-by: Andreas Färber <address@hidden>
---
hw/ppc_newworld.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index 8796510..6f7f1b5 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -136,6 +136,7 @@ static void ppc_core99_init (ram_addr_t ram_size,
const char *initrd_filename,
const char *cpu_model)
{
+ PowerPCCPU *cpu = NULL;
CPUPPCState *env = NULL;
char *filename;
qemu_irq *pic, **openpic_irqs;
@@ -166,11 +167,13 @@ static void ppc_core99_init (ram_addr_t ram_size,
cpu_model = "G4";
#endif
for (i = 0; i < smp_cpus; i++) {
- env = cpu_init(cpu_model);
- if (!env) {
+ cpu = cpu_ppc_init(cpu_model);
+ if (cpu == NULL) {
fprintf(stderr, "Unable to find PowerPC CPU definition\n");
exit(1);
}
+ env = &cpu->env;
+
/* Set time-base frequency to 100 Mhz */
cpu_ppc_tb_init(env, 100UL * 1000UL * 1000UL);
qemu_register_reset(ppc_core99_reset, env);
--
1.7.7
- Re: [Qemu-ppc] [PATCH next v2 00/74] QOM CPUState, part 3: CPU reset, (continued)
- Re: [Qemu-ppc] [PATCH next v2 00/74] QOM CPUState, part 3: CPU reset, Max Filippov, 2012/05/14
- [Qemu-ppc] [PATCH next v2 00/74] QOM CPUState, part 3: CPU reset, Andreas Färber, 2012/05/10
- [Qemu-ppc] [PATCH next v2 24/74] ppc_newworld: Pass PowerPCCPU to ppc_core99_reset(), Andreas Färber, 2012/05/09
- [Qemu-ppc] [PATCH next v2 26/74] ppc_oldworld: Pass PowerPCCPU to ppc_heathrow_reset(), Andreas Färber, 2012/05/09
- [Qemu-ppc] [PATCH next v2 15/74] target-ppc: Let cpu_ppc_init() return PowerPCCPU, Andreas Färber, 2012/05/09
- [Qemu-ppc] [PATCH next v2 27/74] ppc_prep: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/05/09
- [Qemu-ppc] [PATCH next v2 25/74] ppc_oldworld: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/05/09
- [Qemu-ppc] [PATCH next v2 23/74] ppc_newworld: Use cpu_ppc_init() to obtain PowerPCCPU,
Andreas Färber <=
- [Qemu-ppc] [PATCH next v2 32/74] cpu-exec: Use cpu_reset() in cpu_exec() for TARGET_PPC, Andreas Färber, 2012/05/09
- [Qemu-ppc] [PATCH next v2 28/74] ppc_prep: Pass PowerPCCPU to ppc_prep_reset(), Andreas Färber, 2012/05/09
- [Qemu-ppc] [PATCH next v2 74/74] Kill off cpu_state_reset(), Andreas Färber, 2012/05/10
- Message not available
- Re: [Qemu-ppc] [Qemu-devel] [PATCH next v2 73/74] linux-user: Use cpu_reset() after cpu_init() / cpu_copy(), Igor Mammedov, 2012/05/16
- Re: [Qemu-ppc] [Qemu-devel] [PATCH next v2 73/74] linux-user: Use cpu_reset() after cpu_init() / cpu_copy(), Andreas Färber, 2012/05/16
- Re: [Qemu-ppc] [Qemu-devel] [PATCH next v2 73/74] linux-user: Use cpu_reset() after cpu_init() / cpu_copy(), Peter Maydell, 2012/05/16