From: Avi Kivity <avi@redhat.com>
Date: Sun, 18 Sep 2011 13:13:38 +0000 (+0300)
Subject: mips_r4k: initialize i8259 after the ISA bus
X-Git-Tag: cpu-hotplug-port-v2~2249^2~5
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a4ac5e64de1b676e0b377792528580065a574815;p=people%2Faperard%2Fqemu-dm.git

mips_r4k: initialize i8259 after the ISA bus

Succeeding i8259 conversion to ISA requires this.

Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index a7dc48753a..d0564d4449 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -256,8 +256,8 @@ void mips_r4k_init (ram_addr_t ram_size,
     cpu_mips_clock_init(env);
 
     /* The PIC is attached to the MIPS CPU INT0 pin */
-    i8259 = i8259_init(env->irq[2]);
     isa_bus_new(NULL, get_system_io());
+    i8259 = i8259_init(env->irq[2]);
     isa_bus_irqs(i8259);
 
     rtc_init(2000, NULL);