From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49801) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPJPu-0004j6-Fe for qemu-devel@nongnu.org; Fri, 19 Oct 2012 16:43:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TPJPt-0006Vf-51 for qemu-devel@nongnu.org; Fri, 19 Oct 2012 16:43:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24935) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPJPs-0006Un-SI for qemu-devel@nongnu.org; Fri, 19 Oct 2012 16:43:37 -0400 Date: Fri, 19 Oct 2012 16:43:33 -0400 From: Jason Baron Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 11/26] pcie: Convert PCIExpressHost to use the QOM. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, juzhang@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, armbru@redhat.com, agraf@suse.de, blauwirbel@gmail.com, yamahata@valinux.co.jp, alex.williamson@redhat.com, kevin@koconnor.net, avi@redhat.com, mkletzan@redhat.com, pbonzini@redhat.com, lcapitulino@redhat.com, afaerber@suse.de, kraxel@redhat.com From: Jason Baron Let's use PCIExpressHost with QOM. Reviewed-by: Paolo Bonzini Acked-by: Andreas F=C3=A4rber Signed-off-by: Jason Baron --- hw/pcie_host.c | 14 ++++++++++++++ hw/pcie_host.h | 4 ++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/hw/pcie_host.c b/hw/pcie_host.c index e2fd276..027ba05 100644 --- a/hw/pcie_host.c +++ b/hw/pcie_host.c @@ -145,3 +145,17 @@ void pcie_host_mmcfg_update(PCIExpressHost *e, pcie_host_mmcfg_map(e, addr, size); } } + +static const TypeInfo pcie_host_type_info =3D { + .name =3D TYPE_PCIE_HOST_BRIDGE, + .parent =3D TYPE_PCI_HOST_BRIDGE, + .abstract =3D true, + .instance_size =3D sizeof(PCIExpressHost), +}; + +static void pcie_host_register_types(void) +{ + type_register_static(&pcie_host_type_info); +} + +type_init(pcie_host_register_types) diff --git a/hw/pcie_host.h b/hw/pcie_host.h index 2faa54e..2494c71 100644 --- a/hw/pcie_host.h +++ b/hw/pcie_host.h @@ -24,6 +24,10 @@ #include "pci_host.h" #include "memory.h" =20 +#define TYPE_PCIE_HOST_BRIDGE "pcie-host-bridge" +#define PCIE_HOST_BRIDGE(obj) \ + OBJECT_CHECK(PCIExpressHost, (obj), TYPE_PCIE_HOST_BRIDGE) + struct PCIExpressHost { PCIHostState pci; =20 --=20 1.7.1