Patchwork [V8,18/18] pc_piix: initialize ioapic before use.

login
register
mail settings
Submitter Isaku Yamahata
Date Dec. 4, 2009, 5:51 a.m.
Message ID <1259905865-25295-19-git-send-email-yamahata@valinux.co.jp>
Download mbox | patch
Permalink /patch/40302/
State New
Headers show

Comments

Isaku Yamahata - Dec. 4, 2009, 5:51 a.m.
initialize ioapic before use.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
 hw/pc_piix.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Gerd Hoffmann - Dec. 7, 2009, 9:23 a.m.
On 12/04/09 06:51, Isaku Yamahata wrote:

> initialize ioapic before use.

This patch looks like it should be moved up in the series or merged into 
another one to keep it fully bisectable.

I assume qemu broken with that one not applied?

cheers,
   Gerd

Patch

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 35924ea..fcf8aaf 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -81,6 +81,9 @@  static void pc_init1(ram_addr_t ram_size,
     i8259 = i8259_init(cpu_irq[0]);
     isa_irq_state = qemu_mallocz(sizeof(*isa_irq_state));
     isa_irq_state->i8259 = i8259;
+    if (pci_enabled) {
+        isa_irq_state->ioapic = ioapic_init();
+    }
     isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24);
 
     if (pci_enabled) {
@@ -97,9 +100,6 @@  static void pc_init1(ram_addr_t ram_size,
 
     /* init basic PC hardware */
     pc_basic_device_init(isa_irq, &isa_dev, &floppy_controller, &rtc_state);
-    if (pci_enabled) {
-        isa_irq_state->ioapic = ioapic_init();
-    }
 
     for(i = 0; i < nb_nics; i++) {
         NICInfo *nd = &nd_table[i];