diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2010-05-14 16:29:03 +0900 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-05-15 15:32:28 +0000 |
| commit | b8d6f53986c56dfcffe1961cb01877e81d0f8bb5 (patch) | |
| tree | 427e7b17856b52360877125d0493cf7533b79f8d | |
| parent | 93d89f63e5a297f8672daf5d8b7b4df2a999af61 (diff) | |
| download | qemu-b8d6f53986c56dfcffe1961cb01877e81d0f8bb5.zip | |
pc: initialize ioapic before use.
The changeset of 2c8d9340203c7f19265fd4cb2341f568217a3af6
prevents isa_irq_handler() from NULL refering of IsaIrqState::ioapic.
However it would be better to initialize the member before reference.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | hw/pc.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -921,6 +921,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) { @@ -964,9 +967,6 @@ static void pc_init1(ram_addr_t ram_size, register_ioport_read(0x92, 1, 1, ioport92_read, NULL); register_ioport_write(0x92, 1, 1, ioport92_write, NULL); - if (pci_enabled) { - isa_irq_state->ioapic = ioapic_init(); - } pit = pit_init(0x40, isa_reserve_irq(0)); pcspk_init(pit); if (!no_hpet) { |