[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/15] hw/pci-host/i440fx: Add PCI_HOST_PROP_IO_MEM property
From: |
Bernhard Beschow |
Subject: |
[PATCH 11/15] hw/pci-host/i440fx: Add PCI_HOST_PROP_IO_MEM property |
Date: |
Sun, 11 Jun 2023 12:34:08 +0200 |
Introduce the property in anticipation of QOM'ification; Q35 has the same
property.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/pci-host/i440fx.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
index 050200cc46..67eeffb421 100644
--- a/hw/pci-host/i440fx.c
+++ b/hw/pci-host/i440fx.c
@@ -27,7 +27,6 @@
#include "qemu/range.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h"
-#include "hw/pci/pci_bus.h"
#include "hw/pci/pci_host.h"
#include "hw/pci-host/i440fx.h"
#include "hw/qdev-properties.h"
@@ -51,6 +50,7 @@ struct I440FXState {
/*< public >*/
MemoryRegion *system_memory;
+ MemoryRegion *address_space_io;
MemoryRegion *pci_address_space;
MemoryRegion *ram_memory;
Range pci_hole;
@@ -239,17 +239,22 @@ static void i440fx_pcihost_initfn(Object *obj)
object_property_add_link(obj, PCI_HOST_PROP_SYSTEM_MEM, TYPE_MEMORY_REGION,
(Object **) &s->system_memory,
qdev_prop_allow_set_link_before_realize, 0);
+
+ object_property_add_link(obj, PCI_HOST_PROP_IO_MEM, TYPE_MEMORY_REGION,
+ (Object **) &s->address_space_io,
+ qdev_prop_allow_set_link_before_realize, 0);
}
static void i440fx_pcihost_realize(DeviceState *dev, Error **errp)
{
+ I440FXState *s = I440FX_PCI_HOST_BRIDGE(dev);
PCIHostState *phb = PCI_HOST_BRIDGE(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
- memory_region_add_subregion(phb->bus->address_space_io, 0xcf8,
&phb->conf_mem);
+ memory_region_add_subregion(s->address_space_io, 0xcf8, &phb->conf_mem);
sysbus_init_ioports(sbd, 0xcf8, 4);
- memory_region_add_subregion(phb->bus->address_space_io, 0xcfc,
&phb->data_mem);
+ memory_region_add_subregion(s->address_space_io, 0xcfc, &phb->data_mem);
sysbus_init_ioports(sbd, 0xcfc, 4);
/* register i440fx 0xcf8 port as coalesced pio */
@@ -275,11 +280,12 @@ PCIBus *i440fx_init(const char *pci_type,
unsigned i;
s->system_memory = address_space_mem;
+ s->address_space_io = address_space_io;
s->pci_address_space = pci_address_space;
s->ram_memory = ram_memory;
b = pci_root_bus_new(dev, NULL, s->pci_address_space,
- address_space_io, 0, TYPE_PCI_BUS);
+ s->address_space_io, 0, TYPE_PCI_BUS);
phb->bus = b;
object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev));
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
--
2.41.0
- Re: [PATCH 07/15] hw/pci-host/i440fx: Replace magic values by existing constants, (continued)
- [PATCH 05/15] hw/pci-host/q35: Initialize PCI_HOST_BYPASS_IOMMU property from board code, Bernhard Beschow, 2023/06/11
- [PATCH 08/15] hw/pci-host/i440fx: Have common names for some local variables, Bernhard Beschow, 2023/06/11
- [PATCH 10/15] hw/pci-host/i440fx: Make MemoryRegion pointers accessible as properties, Bernhard Beschow, 2023/06/11
- [PATCH 09/15] hw/pci-host/i440fx: Move i440fx_realize() into PCII440FXState section, Bernhard Beschow, 2023/06/11
- [PATCH 11/15] hw/pci-host/i440fx: Add PCI_HOST_PROP_IO_MEM property,
Bernhard Beschow <=
- [PATCH 15/15] hw/i386/pc_piix: Move i440fx' realize near its qdev_new(), Bernhard Beschow, 2023/06/11
[PATCH 12/15] hw/pci-host/i440fx: Add PCI_HOST_{ABOVE, BELOW}_4G_MEM_SIZE properties, Bernhard Beschow, 2023/06/11