summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2011-06-16 18:49:22 +0200
committerAlexander Graf <agraf@suse.de>2011-06-17 02:58:35 +0200
commit0dd4bc7dd45de7afa88662d24bd50a3aafdbab64 (patch)
tree2fedb5be2bde378719d7171d54243f057fadaa9f
parentd1e256fe47be3dd43f38a8ec50f860506f975baf (diff)
downloadhqemu-0dd4bc7dd45de7afa88662d24bd50a3aafdbab64.zip
hqemu-0dd4bc7dd45de7afa88662d24bd50a3aafdbab64.tar.gz
PPC: 440: Use 440 style MMU as default, so Qemu knows the MMU type
We have some KVM interaction code in Qemu that tries to be clever and ignore some capabilities when running on BookE style MMUs. Unfortunately, the default CPU bamboo was defaulting to was not a BookE-style MMU, resulting in the check to fail. With this patch, guests can run again on 440 with -enable-kvm. Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r--hw/ppc440.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/ppc440.c b/hw/ppc440.c
index 1ed001a..90abc91 100644
--- a/hw/ppc440.c
+++ b/hw/ppc440.c
@@ -45,8 +45,9 @@ CPUState *ppc440ep_init(ram_addr_t *ram_size, PCIBus **pcip,
qemu_irq *irqs;
qemu_irq *pci_irqs;
- if (cpu_model == NULL)
- cpu_model = "405"; // XXX: should be 440EP
+ if (cpu_model == NULL) {
+ cpu_model = "440-Xilinx"; // XXX: should be 440EP
+ }
env = cpu_init(cpu_model);
if (!env) {
fprintf(stderr, "Unable to initialize CPU!\n");
OpenPOWER on IntegriCloud