| Message ID | 20191015162705.28087-23-philmd@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge | expand |
On Tuesday, October 15, 2019, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > The block code related to IRQ start few lines later. Move block code -> code block start -> starts the comment and the pc_gsi_create() call where we start call -> invocation > to use the IRQs. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > 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 > > >
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++) {
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é <philmd@redhat.com> --- hw/i386/pc_q35.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)