From patchwork Wed Jul 18 13:19:03 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v4,3/5] convert pci-host to QOM
Date: Wed, 18 Jul 2012 03:19:03 -0000
From: Wanpeng Li <liwanp@linux.vnet.ibm.com>
X-Patchwork-Id: 171670
Message-Id: <1342617545-9261-4-git-send-email-liwanp@linux.vnet.ibm.com>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: Ram Pai <pair@us.ibm.com>, Gavin Shan <shangw@linux.vnet.ibm.com>,
 "Michael S. Tsirkin" <mst@redhat.com>,
 Jan Kiszka <jan.kiszka@siemens.com>, qemu-devel@nongnu.org,
 Liu Ping Fan <kernelfans@gmail.com>, Blue Swirl <blauwirbel@gmail.com>,
 Stefan Weil <weil@mail.berlios.de>, Avi Kivity <avi@redhat.com>,
 Paolo Bonzini <pbonzini@redhat.com>, Wanpeng Li <liwanp@linux.vnet.ibm.com>

[CCing ML]

From: Anthony Liguori <aliguori@us.ibm.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Wanpeng Li <liwanp@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 8041778..095bfe3 100644
--- a/hw/pci_host.c
+++ b/hw/pci_host.c
@@ -165,4 +165,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_info = {
+    .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_info);
+}
+
+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;