From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Richard Henderson" <rth@twiddle.net>
Subject: [PATCH 3/5] hw/i386/pc: Move gsi_state creation code
Date: Fri, 18 Oct 2019 15:59:08 +0200 [thread overview]
Message-ID: <20191018135910.24286-4-philmd@redhat.com> (raw)
In-Reply-To: <20191018135910.24286-1-philmd@redhat.com>
The code block related to IRQ starts few lines later. Move
the comment and the pc_gsi_create() invocation where we start
to use the IRQs.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v2: reword comment (Aleksandar)
---
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
next prev parent reply other threads:[~2019-10-18 14:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-18 13:59 [PATCH 0/5] hw/i386/pc: Extract pc_gsi_create() and pc_i8259_create() Philippe Mathieu-Daudé
2019-10-18 13:59 ` [PATCH 1/5] hw/i386/pc: Extract pc_gsi_create() Philippe Mathieu-Daudé
2019-10-18 13:59 ` [PATCH 2/5] hw/i386/pc: Reduce gsi_handler scope Philippe Mathieu-Daudé
2019-10-18 13:59 ` Philippe Mathieu-Daudé [this message]
2019-10-18 13:59 ` [PATCH 4/5] hw/i386/pc: Extract pc_i8259_create() Philippe Mathieu-Daudé
2019-10-22 16:55 ` [PATCH 0/5] hw/i386/pc: Extract pc_gsi_create() and pc_i8259_create() Paolo Bonzini
2019-10-22 17:32 ` Philippe Mathieu-Daudé
2019-10-26 14:55 ` Philippe Mathieu-Daudé
2019-10-27 16:11 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191018135910.24286-4-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=ehabkost@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).