From ef250db6f152e53c7a96770c77167c366497c192 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Sat, 30 Apr 2011 23:05:03 +0200 Subject: PPC: Make MPC8544DS obey -cpu switch The MPC8544DS board emulation code ignored the user defined -cpu switch. This patch enables it to only provide a sane default, not force an e500v2 CPU inside. Signed-off-by: Alexander Graf --- hw/ppce500_mpc8544ds.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'hw/ppce500_mpc8544ds.c') diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c index e111dda5f4..1b8a1c464d 100644 --- a/hw/ppce500_mpc8544ds.c +++ b/hw/ppce500_mpc8544ds.c @@ -178,7 +178,11 @@ static void mpc8544ds_init(ram_addr_t ram_size, qemu_irq *irqs, *mpic, *pci_irqs; /* Setup CPU */ - env = cpu_ppc_init("e500v2_v30"); + if (cpu_model == NULL) { + cpu_model = "e500v2_v30"; + } + + env = cpu_ppc_init(cpu_model); if (!env) { fprintf(stderr, "Unable to initialize CPU!\n"); exit(1); -- cgit v1.2.3