[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V10 06/27] pc: initialize ioapic before use.
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH V10 06/27] pc: initialize ioapic before use. |
Date: |
Thu, 24 Dec 2009 17:08:59 +0900 |
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 <address@hidden>
---
hw/pc.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index db7d58e..9191b63 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1103,6 +1103,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) {
@@ -1146,9 +1149,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) {
--
1.6.5.4
- [Qemu-devel] [PATCH V10 23/27] pci hotadd, acpi_piix4: remove global variables., (continued)
- [Qemu-devel] [PATCH V10 23/27] pci hotadd, acpi_piix4: remove global variables., Isaku Yamahata, 2009/12/24
- [Qemu-devel] [PATCH V10 01/27] acpi: split out pc smbus routines from acpi.c into pc_smbus.c, Isaku Yamahata, 2009/12/24
- [Qemu-devel] [PATCH V10 08/27] pc: make an unnecessary global variable, pit, local., Isaku Yamahata, 2009/12/24
- [Qemu-devel] [PATCH V10 25/27] acpi_piix4: remove #ifdef DEBUG., Isaku Yamahata, 2009/12/24
- [Qemu-devel] [PATCH V10 13/27] pc: split out cpu initialization from pc_init1() into pc_cpus_init()., Isaku Yamahata, 2009/12/24
- [Qemu-devel] [PATCH V10 24/27] pc_smbus: remove #ifdef DEBUG., Isaku Yamahata, 2009/12/24
- [Qemu-devel] [PATCH V10 26/27] pc_apm: remove #ifdef DEBUG., Isaku Yamahata, 2009/12/24
- [Qemu-devel] [PATCH V10 07/27] pc, i440fx: Make smm enable/disable function i440fx independent., Isaku Yamahata, 2009/12/24
- [Qemu-devel] [PATCH V10 02/27] acpi: split out apm register emulation from acpi.c, Isaku Yamahata, 2009/12/24
- [Qemu-devel] [PATCH V10 10/27] pc: remove global variable rtc_state by using qemu_irq., Isaku Yamahata, 2009/12/24
- [Qemu-devel] [PATCH V10 06/27] pc: initialize ioapic before use.,
Isaku Yamahata <=
- [Qemu-devel] [PATCH V10 14/27] pc: split out memory allocation from pc_init1() into pc_memory_init(), Isaku Yamahata, 2009/12/24
- [Qemu-devel] [PATCH V10 16/27] pc: split out basic device init from pc_init1() into pc_basic_device_init(), Isaku Yamahata, 2009/12/24
- [Qemu-devel] [PATCH V10 18/27] pc: split out piix specific part from pc.c into pc_piix.c, Isaku Yamahata, 2009/12/24
- [Qemu-devel] [PATCH V10 05/27] acpi_piix4: remove unused variable in get_pmsts()., Isaku Yamahata, 2009/12/24
- [Qemu-devel] [PATCH V10 03/27] acpi: add acpi constants from linux header files and use them., Isaku Yamahata, 2009/12/24