[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 11/17] hw/pci-host/i440fx: Move i440fx_realize() into PCII440F
From: |
Bernhard Beschow |
Subject: |
[PATCH v3 11/17] hw/pci-host/i440fx: Move i440fx_realize() into PCII440FXState section |
Date: |
Fri, 30 Jun 2023 09:37:14 +0200 |
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 0b76fe71af..e84fcd50b6 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
- [PATCH v3 02/17] hw/pci-host/q35: Fix double, contradicting .endianness assignment, (continued)
- [PATCH v3 02/17] hw/pci-host/q35: Fix double, contradicting .endianness assignment, Bernhard Beschow, 2023/06/30
- [PATCH v3 03/17] hw/pci-host/q35: Initialize PCMachineState::bus in board code, Bernhard Beschow, 2023/06/30
- [PATCH v3 05/17] hw/pci-host/q35: Initialize PCI_HOST_BYPASS_IOMMU property from board code, Bernhard Beschow, 2023/06/30
- [PATCH v3 06/17] hw/pci-host/q35: Make some property name macros reusable by i440fx, Bernhard Beschow, 2023/06/30
- [PATCH v3 15/17] hw/pci-host/i440fx: Add I440FX_HOST_PROP_PCI_TYPE property, Bernhard Beschow, 2023/06/30
- [PATCH v3 04/17] hw/pci/pci_host: Introduce PCI_HOST_BYPASS_IOMMU macro, Bernhard Beschow, 2023/06/30
- [PATCH v3 07/17] hw/i386/pc_piix: Turn some local variables into initializers, Bernhard Beschow, 2023/06/30
- [PATCH v3 09/17] hw/pci-host/i440fx: Replace magic values by existing constants, Bernhard Beschow, 2023/06/30
- [PATCH v3 08/17] hw/pci-host/i440fx: Add "i440fx" child property in board code, Bernhard Beschow, 2023/06/30
- [PATCH v3 12/17] hw/pci-host/i440fx: Make MemoryRegion pointers accessible as properties, Bernhard Beschow, 2023/06/30
- [PATCH v3 11/17] hw/pci-host/i440fx: Move i440fx_realize() into PCII440FXState section,
Bernhard Beschow <=
- [PATCH v3 16/17] hw/pci-host/i440fx: Resolve i440fx_init(), Bernhard Beschow, 2023/06/30
- [PATCH v3 14/17] hw/pci-host/i440fx: Add PCI_HOST_{ABOVE, BELOW}_4G_MEM_SIZE properties, Bernhard Beschow, 2023/06/30
- [PATCH v3 17/17] hw/i386/pc_piix: Move i440fx' realize near its qdev_new(), Bernhard Beschow, 2023/06/30
- [PATCH v3 13/17] hw/pci-host/i440fx: Add PCI_HOST_PROP_IO_MEM property, Bernhard Beschow, 2023/06/30
- [PATCH v3 10/17] hw/pci-host/i440fx: Have common names for some local variables, Bernhard Beschow, 2023/06/30