From patchwork Fri Dec 4 05:51:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V8,18/18] pc_piix: initialize ioapic before use. Date: Thu, 03 Dec 2009 19:51:05 -0000 From: Isaku Yamahata X-Patchwork-Id: 40302 Message-Id: <1259905865-25295-19-git-send-email-yamahata@valinux.co.jp> To: qemu-devel@nongnu.org Cc: yamahata@valinux.co.jp initialize ioapic before use. Signed-off-by: Isaku Yamahata --- hw/pc_piix.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) 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];