aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHollis Blanchard <hollisb@us.ibm.com>2008-07-23 15:30:13 -0500
committerAvi Kivity <avi@qumranet.com>2008-07-27 13:08:56 +0300
commit624a27d8e8342f07c916a32bda9874757f85aa52 (patch)
tree92fb8126a8877485b8ad94581fd4912a754a7d91
parent25ba22b6a0a46985a2ee0ee98e324da877dfab21 (diff)
kvm: ppc: qemu: Fix 440 CPU initializationkvm-72
Qemu doesn't implement 440 emulation, so pretend we're 405 instead. (We used to provide our own cpu_ppc_find_by_name() function that allowed us to use "440".) This fixes a fatal runtime error introduced in a recent upstream qemu merge. Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
-rw-r--r--hw/ppc440_bamboo.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 29210f05c..9ff6f7d22 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -77,10 +77,12 @@ void bamboo_init(ram_addr_t ram_size, int vga_ram_size,
mem_reg_property[2] = ram_size;
}
- /* Setup CPU */
- env = cpu_ppc_init("440");
+ /* Setup CPU.
+ * XXX Since qemu doesn't implement 440, we just say it's a 405. Since
+ * we don't use qemu's CPU emulation it seems to be working OK. */
+ env = cpu_ppc_init("405");
if (!env) {
- fprintf(stderr, "Unable to initilize CPU!\n");
+ fprintf(stderr, "Unable to initialize CPU!\n");
exit(1);
}