OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pc: keep gsi reference 

Further cleanup would need to call qemu_free_irq() at the appropriate
time, but for now this silences ASAN about direct leaks.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-07-14 18:03:29 +02:00
parent 8197e24c38
commit 3e6c0c4c2c
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/i386/pc_piix.c
View File

@ -74,7 +74,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 *gsi;
qemu_irq *i8259; qemu_irq *i8259;
qemu_irq smi_irq; qemu_irq smi_irq;
GSIState *gsi_state; GSIState *gsi_state;
@ -185,16 +184,16 @@ static void pc_init1(MachineState *machine,
gsi_state = g_malloc0(sizeof(*gsi_state)); gsi_state = g_malloc0(sizeof(*gsi_state));
if (kvm_ioapic_in_kernel()) { if (kvm_ioapic_in_kernel()) {
kvm_pc_setup_irq_routing(pcmc->pci_enabled); kvm_pc_setup_irq_routing(pcmc->pci_enabled);
gsi = qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state, pcms->gsi = qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state,
GSI_NUM_PINS); GSI_NUM_PINS);
} else { } else {
gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS); pcms->gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
} }
if (pcmc->pci_enabled) { if (pcmc->pci_enabled) {
pci_bus = i440fx_init(host_type, pci_bus = i440fx_init(host_type,
pci_type, pci_type,
&i440fx_state, &piix3_devfn, &isa_bus, gsi, &i440fx_state, &piix3_devfn, &isa_bus, pcms->gsi,
system_memory, system_io, machine->ram_size, system_memory, system_io, machine->ram_size,
pcms->below_4g_mem_size, pcms->below_4g_mem_size,
pcms->above_4g_mem_size, pcms->above_4g_mem_size,
@ -207,7 +206,7 @@ static void pc_init1(MachineState *machine,
&error_abort); &error_abort);
no_hpet = 1; no_hpet = 1;
} }
isa_bus_irqs(isa_bus, gsi); isa_bus_irqs(isa_bus, pcms->gsi);
if (kvm_pic_in_kernel()) { if (kvm_pic_in_kernel()) {
i8259 = kvm_i8259_init(isa_bus); i8259 = kvm_i8259_init(isa_bus);
@ -225,7 +224,7 @@ static void pc_init1(MachineState *machine,
ioapic_init_gsi(gsi_state, "i440fx"); ioapic_init_gsi(gsi_state, "i440fx");
} }
pc_register_ferr_irq(gsi[13]); pc_register_ferr_irq(pcms->gsi[13]);
pc_vga_init(isa_bus, pcmc->pci_enabled ? pci_bus : NULL); pc_vga_init(isa_bus, pcmc->pci_enabled ? pci_bus : NULL);
@ -235,7 +234,7 @@ static void pc_init1(MachineState *machine,
} }
/* init basic PC hardware */ /* init basic PC hardware */
pc_basic_device_init(isa_bus, gsi, &rtc_state, true, pc_basic_device_init(isa_bus, pcms->gsi, &rtc_state, true,
(pcms->vmport != ON_OFF_AUTO_ON), 0x4); (pcms->vmport != ON_OFF_AUTO_ON), 0x4);
pc_nic_init(isa_bus, pci_bus); pc_nic_init(isa_bus, pci_bus);
@ -279,7 +278,7 @@ static void pc_init1(MachineState *machine,
smi_irq = qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0); smi_irq = qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0);
/* TODO: Populate SPD eeprom data. */ /* TODO: Populate SPD eeprom data. */
smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100, smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
gsi[9], smi_irq, pcms->gsi[9], smi_irq,
pc_machine_is_smm_enabled(pcms), pc_machine_is_smm_enabled(pcms),
&piix4_pm); &piix4_pm);
smbus_eeprom_init(smbus, 8, NULL, 0); smbus_eeprom_init(smbus, 8, NULL, 0);

11
hw/i386/pc_q35.c
View File

@ -69,7 +69,6 @@ static void pc_q35_init(MachineState *machine)
MemoryRegion *ram_memory; MemoryRegion *ram_memory;
GSIState *gsi_state; GSIState *gsi_state;
ISABus *isa_bus; ISABus *isa_bus;
qemu_irq *gsi;
qemu_irq *i8259; qemu_irq *i8259;
int i; int i;
ICH9LPCState *ich9_lpc; ICH9LPCState *ich9_lpc;
@ -153,10 +152,10 @@ static void pc_q35_init(MachineState *machine)
gsi_state = g_malloc0(sizeof(*gsi_state)); gsi_state = g_malloc0(sizeof(*gsi_state));
if (kvm_ioapic_in_kernel()) { if (kvm_ioapic_in_kernel()) {
kvm_pc_setup_irq_routing(pcmc->pci_enabled); kvm_pc_setup_irq_routing(pcmc->pci_enabled);
gsi = qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state, pcms->gsi = qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state,
GSI_NUM_PINS); GSI_NUM_PINS);
} else { } else {
gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS); pcms->gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
} }
/* create pci host bus */ /* create pci host bus */
@ -195,7 +194,7 @@ static void pc_q35_init(MachineState *machine)
ich9_lpc = ICH9_LPC_DEVICE(lpc); ich9_lpc = ICH9_LPC_DEVICE(lpc);
lpc_dev = DEVICE(lpc); lpc_dev = DEVICE(lpc);
for (i = 0; i < GSI_NUM_PINS; i++) { for (i = 0; i < GSI_NUM_PINS; i++) {
qdev_connect_gpio_out_named(lpc_dev, ICH9_GPIO_GSI, i, gsi[i]); qdev_connect_gpio_out_named(lpc_dev, ICH9_GPIO_GSI, i, pcms->gsi[i]);
} }
pci_bus_irqs(host_bus, ich9_lpc_set_irq, ich9_lpc_map_irq, ich9_lpc, pci_bus_irqs(host_bus, ich9_lpc_set_irq, ich9_lpc_map_irq, ich9_lpc,
ICH9_LPC_NB_PIRQS); ICH9_LPC_NB_PIRQS);
@ -219,7 +218,7 @@ static void pc_q35_init(MachineState *machine)
ioapic_init_gsi(gsi_state, "q35"); ioapic_init_gsi(gsi_state, "q35");
} }
pc_register_ferr_irq(gsi[13]); pc_register_ferr_irq(pcms->gsi[13]);
assert(pcms->vmport != ON_OFF_AUTO__MAX); assert(pcms->vmport != ON_OFF_AUTO__MAX);
if (pcms->vmport == ON_OFF_AUTO_AUTO) { if (pcms->vmport == ON_OFF_AUTO_AUTO) {
@ -227,7 +226,7 @@ static void pc_q35_init(MachineState *machine)
} }
/* init basic PC hardware */ /* init basic PC hardware */
pc_basic_device_init(isa_bus, gsi, &rtc_state, !mc->no_floppy, pc_basic_device_init(isa_bus, pcms->gsi, &rtc_state, !mc->no_floppy,
(pcms->vmport != ON_OFF_AUTO_ON), 0xff0104); (pcms->vmport != ON_OFF_AUTO_ON), 0xff0104);
/* connect pm stuff to lpc */ /* connect pm stuff to lpc */

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

@ -53,6 +53,7 @@ struct PCMachineState {
ISADevice *rtc; ISADevice *rtc;
PCIBus *bus; PCIBus *bus;
FWCfgState *fw_cfg; FWCfgState *fw_cfg;
qemu_irq *gsi;
/* Configuration options: */ /* Configuration options: */
uint64_t max_ram_below_4g; uint64_t max_ram_below_4g;