ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/i386/pc: Fix misusing qemu_allocate_irqs for single irq 

Since pc_allocate_cpu_irq only requests one irq, so let it just call
qemu_allocate_irq.

Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Shannon Zhao 2015-05-29 13:26:59 +08:00 committed by Michael Tokarev
parent 9ff7f5bddb
commit 0b0cc076b7
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/i386/pc.c
View File

@ -1345,9 +1345,9 @@ FWCfgState *pc_memory_init(MachineState *machine,
return fw_cfg; return fw_cfg;
} }
qemu_irq *pc_allocate_cpu_irq(void) qemu_irq pc_allocate_cpu_irq(void)
{ {
return qemu_allocate_irqs(pic_irq_request, NULL, 1); return qemu_allocate_irq(pic_irq_request, NULL, 0);
} }
DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus) DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus)

4
hw/i386/pc_piix.c
View File

@ -86,7 +86,6 @@ static void pc_init1(MachineState *machine)
ISABus *isa_bus; ISABus *isa_bus;
PCII440FXState *i440fx_state; PCII440FXState *i440fx_state;
int piix3_devfn = -1; int piix3_devfn = -1;
qemu_irq *cpu_irq;
qemu_irq *gsi; qemu_irq *gsi;
qemu_irq *i8259; qemu_irq *i8259;
qemu_irq smi_irq; qemu_irq smi_irq;
@ -220,8 +219,7 @@ static void pc_init1(MachineState *machine)
} else if (xen_enabled()) { } else if (xen_enabled()) {
i8259 = xen_interrupt_controller_init(); i8259 = xen_interrupt_controller_init();
} else { } else {
cpu_irq = pc_allocate_cpu_irq(); i8259 = i8259_init(isa_bus, pc_allocate_cpu_irq());
i8259 = i8259_init(isa_bus, cpu_irq[0]);
} }
for (i = 0; i < ISA_NUM_IRQS; i++) { for (i = 0; i < ISA_NUM_IRQS; i++) {

4
hw/i386/pc_q35.c
View File

@ -79,7 +79,6 @@ static void pc_q35_init(MachineState *machine)
GSIState *gsi_state; GSIState *gsi_state;
ISABus *isa_bus; ISABus *isa_bus;
int pci_enabled = 1; int pci_enabled = 1;
qemu_irq *cpu_irq;
qemu_irq *gsi; qemu_irq *gsi;
qemu_irq *i8259; qemu_irq *i8259;
int i; int i;
@ -230,8 +229,7 @@ static void pc_q35_init(MachineState *machine)
} else if (xen_enabled()) { } else if (xen_enabled()) {
i8259 = xen_interrupt_controller_init(); i8259 = xen_interrupt_controller_init();
} else { } else {
cpu_irq = pc_allocate_cpu_irq(); i8259 = i8259_init(isa_bus, pc_allocate_cpu_irq());
i8259 = i8259_init(isa_bus, cpu_irq[0]);
} }
for (i = 0; i < ISA_NUM_IRQS; i++) { for (i = 0; i < ISA_NUM_IRQS; i++) {

2
include/hw/i386/pc.h
View File

@ -193,7 +193,7 @@ FWCfgState *pc_memory_init(MachineState *machine,
MemoryRegion *rom_memory, MemoryRegion *rom_memory,
MemoryRegion **ram_memory, MemoryRegion **ram_memory,
PcGuestInfo *guest_info); PcGuestInfo *guest_info);
qemu_irq *pc_allocate_cpu_irq(void); qemu_irq pc_allocate_cpu_irq(void);
DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus);
void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
ISADevice **rtc_state, ISADevice **rtc_state,