From: Bernhard Beschow <shentey@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Eduardo Habkost" <eduardo@habkost.net>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Bernhard Beschow" <shentey@gmail.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v2 09/16] hw/pci-host/i440fx: Move i440fx_realize() into PCII440FXState section
Date: Wed, 28 Jun 2023 21:51:57 +0200 [thread overview]
Message-ID: <20230628195204.1241-10-shentey@gmail.com> (raw)
In-Reply-To: <20230628195204.1241-1-shentey@gmail.com>
i440fx_realize() realizes the PCI device inside the host bridge
(PCII440FXState), but is implemented between i440fx_pcihost_realize() and
i440fx_init() which deal with the host bridge itself (I440FXState). Since we
want to append i440fx_init() to i440fx_pcihost_realize() later let's move
i440fx_realize() out of the way.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/pci-host/i440fx.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
index 88beaf99c4..9df4688b2e 100644
--- a/hw/pci-host/i440fx.c
+++ b/hw/pci-host/i440fx.c
@@ -65,6 +65,15 @@ struct I440FXState {
*/
#define I440FX_COREBOOT_RAM_SIZE 0x57
+static void i440fx_realize(PCIDevice *dev, Error **errp)
+{
+ dev->config[I440FX_SMRAM] = 0x02;
+
+ if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) {
+ warn_report("i440fx doesn't support emulated iommu");
+ }
+}
+
static void i440fx_update_memory_mappings(PCII440FXState *d)
{
int i;
@@ -229,15 +238,6 @@ static void i440fx_pcihost_realize(DeviceState *dev, Error **errp)
memory_region_add_coalescing(&phb->conf_mem, 0, 4);
}
-static void i440fx_realize(PCIDevice *dev, Error **errp)
-{
- dev->config[I440FX_SMRAM] = 0x02;
-
- if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) {
- warn_report("i440fx doesn't support emulated iommu");
- }
-}
-
PCIBus *i440fx_init(const char *pci_type,
DeviceState *dev,
MemoryRegion *address_space_mem,
--
2.41.0
next prev parent reply other threads:[~2023-06-28 19:54 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-28 19:51 [PATCH v2 00/16] Q35 and I440FX host bridge QOM cleanup Bernhard Beschow
2023-06-28 19:51 ` [PATCH v2 01/16] hw/i386/pc_q35: Resolve redundant q35_host variable Bernhard Beschow
2023-06-29 7:43 ` Philippe Mathieu-Daudé
2023-06-28 19:51 ` [PATCH v2 02/16] hw/pci-host/q35: Fix double, contradicting .endianness assignment Bernhard Beschow
2023-06-29 7:42 ` Philippe Mathieu-Daudé
2023-06-28 19:51 ` [PATCH v2 03/16] hw/pci-host/q35: Initialize PCMachineState::bus in board code Bernhard Beschow
2023-06-28 19:51 ` [PATCH v2 04/16] hw/pci/pci_host: Introduce PCI_HOST_BYPASS_IOMMU macro Bernhard Beschow
2023-06-28 19:51 ` [PATCH v2 05/16] hw/pci-host/q35: Initialize PCI_HOST_BYPASS_IOMMU property from board code Bernhard Beschow
2023-06-28 19:51 ` [PATCH v2 06/16] hw/pci-host/q35: Make some property name macros reusable by i440fx Bernhard Beschow
2023-06-28 19:51 ` [PATCH v2 07/16] hw/pci-host/i440fx: Replace magic values by existing constants Bernhard Beschow
2023-06-28 19:51 ` [PATCH v2 08/16] hw/pci-host/i440fx: Have common names for some local variables Bernhard Beschow
2023-06-28 19:51 ` Bernhard Beschow [this message]
2023-06-28 19:51 ` [PATCH v2 10/16] hw/pci-host/i440fx: Make MemoryRegion pointers accessible as properties Bernhard Beschow
2023-06-28 19:51 ` [PATCH v2 11/16] hw/pci-host/i440fx: Add PCI_HOST_PROP_IO_MEM property Bernhard Beschow
2023-06-28 19:52 ` [PATCH v2 12/16] hw/pci-host/i440fx: Add PCI_HOST_{ABOVE, BELOW}_4G_MEM_SIZE properties Bernhard Beschow
2023-06-28 19:52 ` [PATCH v2 13/16] hw/pci-host/i440fx: Add I440FX_HOST_PROP_PCI_TYPE property Bernhard Beschow
2023-06-28 19:52 ` [PATCH v2 14/16] hw/pci-host/i440fx: Resolve i440fx_init() Bernhard Beschow
2023-06-29 7:50 ` Philippe Mathieu-Daudé
2023-06-29 16:52 ` Bernhard Beschow
2023-06-28 19:52 ` [PATCH v2 15/16] hw/i386/pc_piix: Turn some local variables into initializers Bernhard Beschow
2023-06-29 7:39 ` Philippe Mathieu-Daudé
2023-06-28 19:52 ` [PATCH v2 16/16] hw/i386/pc_piix: Move i440fx' realize near its qdev_new() Bernhard Beschow
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=20230628195204.1241-10-shentey@gmail.com \
--to=shentey@gmail.com \
--cc=eduardo@habkost.net \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/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).