commit ef250db6f152e53c7a96770c77167c366497c192
author Alexander Graf <agraf@suse.de> Sat Apr 30 23:05:03 2011 +0200
committer Alexander Graf <agraf@suse.de> Thu May 12 00:24:51 2011 +0200
tree 54bae20a4ab4dcbeabdb06f6efb61dde6f30c352
parent 7d7ba3feced4a28350fac84123be23a2fea1e28f

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 <agraf@suse.de>

hw/ppce500_mpc8544ds.c

diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
index e111dda..1b8a1c4 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppce500_mpc8544ds.c
@@ -178,7 +178,11 @@
     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);