On Mon, Mar 26, 2012 at 10:06:45AM +0800, Wanpeng Li wrote: > >From: Anthony Liguori <aligu...@us.ibm.com> > > >Signed-off-by: Anthony Liguori <aligu...@us.ibm.com> >Signed-off-by: Wanpeng Li <l...@linux.vnet.ibm.com> > >--- > hw/pci_host.c | 26 ++++++++++++++++++++++++++ > hw/pci_host.h | 5 +++++ > 2 files changed, 31 insertions(+), 0 deletions(-) > >diff --git a/hw/pci_host.c b/hw/pci_host.c >index 44c6c20..44d7e55 100644 >--- a/hw/pci_host.c >+++ b/hw/pci_host.c >@@ -162,4 +162,30 @@ const MemoryRegionOps pci_host_data_be_ops = { > .endianness = DEVICE_BIG_ENDIAN, > }; > >+void pci_host_set_mmio(PCIHostState *s, MemoryRegion *value) >+{ >+ object_property_set_link(OBJECT(s), OBJECT(value), "mmio", NULL); >+} >+ >+static void pci_host_initfn(Object *obj) >+{ >+ PCIHostState *s = PCI_HOST(obj); >+ >+ object_property_add_link(obj, "mmio", TYPE_MEMORY_REGION, >+ (Object **)&s->address_space, >NULL); >+} >+ >+static TypeInfo pci_host_type = { >+ .name = TYPE_PCI_HOST, >+ .parent = TYPE_SYS_BUS_DEVICE, >+ .instance_size = sizeof(PCIHostState), >+ .instance_init = pci_host_initfn, >+}; >+ >+static void register_devices(void) >+{ >+ type_register_static(&pci_host_type); >+} >+ >+type_init(register_devices); > >diff --git a/hw/pci_host.h b/hw/pci_host.h >index 359e38f..084e15c 100644 >--- a/hw/pci_host.h >+++ b/hw/pci_host.h >@@ -30,6 +30,9 @@ > > #include "sysbus.h" > >+#define TYPE_PCI_HOST "pci-host" >+#define PCI_HOST(obj) OBJECT_CHECK(PCIHostState, (obj), TYPE_PCI_HOST) >+ > struct PCIHostState { > SysBusDevice busdev; > MemoryRegion conf_mem; >@@ -49,6 +52,8 @@ uint32_t pci_host_config_read_common(PCIDevice *pci_dev, >uint32_t addr, > void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len); > uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len); > >+void pci_host_set_mmio(PCIHostState *s, MemoryRegion *value); >+ > extern const MemoryRegionOps pci_host_conf_le_ops; > extern const MemoryRegionOps pci_host_conf_be_ops; > extern const MemoryRegionOps pci_host_data_le_ops; >-- >1.7.5.4 >
>From 72bc193e6e25cb393437317843a701b82a9b9233 Mon Sep 17 00:00:00 2001 From: Wanpeng Li <l...@linux.vnet.ibm.com> Date: Thu, 22 Mar 2012 17:57:30 +0800 Subject: [PATCH 3/6] convert pci-host to QOM From: Anthony Liguori <aligu...@us.ibm.com> Signed-off-by: Anthony Liguori <aligu...@us.ibm.com> Signed-off-by: Wanpeng Li <l...@linux.vnet.ibm.com> --- hw/pci_host.c | 26 ++++++++++++++++++++++++++ hw/pci_host.h | 5 +++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/hw/pci_host.c b/hw/pci_host.c index 44c6c20..44d7e55 100644 --- a/hw/pci_host.c +++ b/hw/pci_host.c @@ -162,4 +162,30 @@ const MemoryRegionOps pci_host_data_be_ops = { .endianness = DEVICE_BIG_ENDIAN, }; +void pci_host_set_mmio(PCIHostState *s, MemoryRegion *value) +{ + object_property_set_link(OBJECT(s), OBJECT(value), "mmio", NULL); +} + +static void pci_host_initfn(Object *obj) +{ + PCIHostState *s = PCI_HOST(obj); + + object_property_add_link(obj, "mmio", TYPE_MEMORY_REGION, + (Object **)&s->address_space, NULL); +} + +static TypeInfo pci_host_type = { + .name = TYPE_PCI_HOST, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(PCIHostState), + .instance_init = pci_host_initfn, +}; + +static void register_devices(void) +{ + type_register_static(&pci_host_type); +} + +type_init(register_devices); diff --git a/hw/pci_host.h b/hw/pci_host.h index 359e38f..084e15c 100644 --- a/hw/pci_host.h +++ b/hw/pci_host.h @@ -30,6 +30,9 @@ #include "sysbus.h" +#define TYPE_PCI_HOST "pci-host" +#define PCI_HOST(obj) OBJECT_CHECK(PCIHostState, (obj), TYPE_PCI_HOST) + struct PCIHostState { SysBusDevice busdev; MemoryRegion conf_mem; @@ -49,6 +52,8 @@ uint32_t pci_host_config_read_common(PCIDevice *pci_dev, uint32_t addr, void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len); uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len); +void pci_host_set_mmio(PCIHostState *s, MemoryRegion *value); + extern const MemoryRegionOps pci_host_conf_le_ops; extern const MemoryRegionOps pci_host_conf_be_ops; extern const MemoryRegionOps pci_host_data_le_ops; -- 1.7.5.4