diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-26 08:00:40 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-26 08:00:40 -0500 |
| commit | 4c54661feb0437eab99186a0e462524e18592b9c (patch) | |
| tree | 7e2c4969ac479ca13bfacbd569af3c08be103bad /hw/ppc_prep.c | |
| parent | 04970fd9339f75f5d21c094ab816a8e429dc1ff1 (diff) | |
| parent | 2f290a8c3db977056e4840810d0dd42032745f21 (diff) | |
| download | focaccia-qemu-4c54661feb0437eab99186a0e462524e18592b9c.tar.gz focaccia-qemu-4c54661feb0437eab99186a0e462524e18592b9c.zip | |
Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
Diffstat (limited to 'hw/ppc_prep.c')
| -rw-r--r-- | hw/ppc_prep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 515de42da4..d26049b1d1 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -648,10 +648,10 @@ static void ppc_prep_init (ram_addr_t ram_size, if (PPC_INPUT(env) != PPC_FLAGS_INPUT_6xx) { hw_error("Only 6xx bus is supported on PREP machine\n"); } + /* Hmm, prep has no pci-isa bridge ??? */ + isa_bus_new(NULL, get_system_io()); i8259 = i8259_init(first_cpu->irq_inputs[PPC6xx_INPUT_INT]); pci_bus = pci_prep_init(i8259, get_system_memory(), get_system_io()); - /* Hmm, prep has no pci-isa bridge ??? */ - isa_bus_new(NULL); isa_bus_irqs(i8259); // pci_bus = i440fx_init(); /* Register 8 MB of ISA IO space (needed for non-contiguous map) */ |