[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 22/32] hw/i386/pc: Move gsi_state creation code
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 22/32] hw/i386/pc: Move gsi_state creation code |
Date: |
Tue, 15 Oct 2019 18:26:55 +0200 |
The block code related to IRQ start few lines later. Move
the comment and the pc_gsi_create() call where we start
to use the IRQs.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/i386/pc_q35.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 52261962b8..6d096eff28 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -209,9 +209,6 @@ static void pc_q35_init(MachineState *machine)
rom_memory, &ram_memory);
}
- /* irq lines */
- gsi_state = pc_gsi_create(&pcms->gsi, pcmc->pci_enabled);
-
/* create pci host bus */
q35_host = Q35_HOST_DEVICE(qdev_create(NULL, TYPE_Q35_HOST_DEVICE));
@@ -245,6 +242,9 @@ static void pc_q35_init(MachineState *machine)
object_property_set_link(OBJECT(machine), OBJECT(lpc),
PC_MACHINE_ACPI_DEVICE_PROP, &error_abort);
+ /* irq lines */
+ gsi_state = pc_gsi_create(&pcms->gsi, pcmc->pci_enabled);
+
ich9_lpc = ICH9_LPC_DEVICE(lpc);
lpc_dev = DEVICE(lpc);
for (i = 0; i < GSI_NUM_PINS; i++) {
--
2.21.0
- [PATCH 19/32] hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c, (continued)
- [PATCH 22/32] hw/i386/pc: Move gsi_state creation code,
Philippe Mathieu-Daudé <=
- [PATCH 23/32] hw/i386/pc: Extract pc_i8259_create(), Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 24/32] hw/i386/pc: Remove kvm_i386.h include, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 25/32] hw/pci-host/piix: Extract piix3_create(), Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 26/32] hw/pci-host/piix: Move RCR_IOPORT register definition, Philippe Mathieu-Daudé, 2019/10/15
[PATCH 27/32] hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers, Philippe Mathieu-Daudé, 2019/10/15