[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-next 17/74] spapr: Use cpu_ppc_init() to obtain
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-next 17/74] spapr: Use cpu_ppc_init() to obtain PowerPCCPU |
Date: |
Sun, 6 May 2012 17:34:17 +0200 |
Needed for spapr_cpu_reset().
Signed-off-by: Andreas Färber <address@hidden>
---
hw/spapr.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/spapr.c b/hw/spapr.c
index cca20f9..2672330 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -518,6 +518,7 @@ static void ppc_spapr_init(ram_addr_t ram_size,
const char *initrd_filename,
const char *cpu_model)
{
+ PowerPCCPU *cpu;
CPUPPCState *env;
int i;
MemoryRegion *sysmem = get_system_memory();
@@ -560,12 +561,13 @@ static void ppc_spapr_init(ram_addr_t ram_size,
cpu_model = kvm_enabled() ? "host" : "POWER7";
}
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 512 MHz */
cpu_ppc_tb_init(env, TIMEBASE_FREQ);
qemu_register_reset(spapr_cpu_reset, env);
--
1.7.7
- [Qemu-devel] [PATCH for-next 07/74] target-sparc: Let cpu_sparc_init() return SPARCCPU, (continued)
- [Qemu-devel] [PATCH for-next 07/74] target-sparc: Let cpu_sparc_init() return SPARCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 10/74] sun4u: Use cpu_sparc_init() to obtain SPARCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 16/74] ppce500_mpc8544ds: Pass PowerPCCPU to mpc8544ds_cpu_reset[_sec], Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 19/74] ppc440_bamboo: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 12/74] sun4u: Store SPARCCPU in ResetData, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 14/74] leon3: Store SPARCCPU in ResetData, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 11/74] sun4u: Let cpu_devinit() return SPARCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 13/74] leon3: Use cpu_sparc_init() to obtain SPARCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 21/74] ppc4xx_devs: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 09/74] sun4m: Pass SPARCCPU to {main, secondary}_cpu_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 17/74] spapr: Use cpu_ppc_init() to obtain PowerPCCPU,
Andreas Färber <=
- [Qemu-devel] [PATCH for-next 20/74] ppc440_bamboo: Pass PowerPCCPU to main_cpu_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 18/74] spapr: Pass PowerPCCPU to spapr_cpu_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 15/74] target-ppc: Let cpu_ppc_init() return PowerPCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 22/74] ppc4xx_devs: Pass PowerPCCPU to ppc4xx_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 24/74] ppc_newworld: Pass PowerPCCPU to ppc_core99_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 23/74] ppc_newworld: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 29/74] virtex_ml507: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 28/74] ppc_prep: Pass PowerPCCPU to ppc_prep_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 27/74] ppc_prep: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 25/74] ppc_oldworld: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/05/06