diff options
author | Avi Kivity <avi@redhat.com> | 2011-09-18 16:13:38 +0300 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2011-09-25 14:58:37 +0300 |
commit | bac8ad41ab22880e8318cb9ce27083ce0560000c (patch) | |
tree | 9d5c7ca9ab814083c12912cf1f53f08657cc27ce /hw/ppc_prep.c | |
parent | a4ac5e64de1b676e0b377792528580065a574815 (diff) | |
download | hqemu-bac8ad41ab22880e8318cb9ce27083ce0560000c.zip hqemu-bac8ad41ab22880e8318cb9ce27083ce0560000c.tar.gz |
ppc_prep: initialize i8259 after the ISA bus
Succeeding i8259 conversion to ISA requires this.
Signed-off-by: Avi Kivity <avi@redhat.com>
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 f9325bd..d26049b 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"); } - 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, 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()); isa_bus_irqs(i8259); // pci_bus = i440fx_init(); /* Register 8 MB of ISA IO space (needed for non-contiguous map) */ |