diff mbox

[v3,11/26] pcie: Convert PCIExpressHost to use the QOM.

Message ID fd04257c63ffaa23c0cfaec90c578d30f93e600b.1350677361.git.jbaron@redhat.com
State New
Headers show

Commit Message

Jason Baron Oct. 19, 2012, 8:43 p.m. UTC 
From: Jason Baron <jbaron@redhat.com>

Let's use PCIExpressHost with QOM.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Jason Baron <jbaron@redhat.com>
---
 hw/pcie_host.c |   14 ++++++++++++++
 hw/pcie_host.h |    4 ++++
 2 files changed, 18 insertions(+), 0 deletions(-)

Comments

Michael S. Tsirkin Oct. 22, 2012, 10:55 a.m. UTC | #1 
On Fri, Oct 19, 2012 at 04:43:33PM -0400, Jason Baron wrote:
> From: Jason Baron <jbaron@redhat.com>
> 
> Let's use PCIExpressHost with QOM.
> 
> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
> Acked-by: Andreas Färber <afaerber@suse.de>
> Signed-off-by: Jason Baron <jbaron@redhat.com>

Applied, thanks.

> ---
>  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 = {
> +    .name = TYPE_PCIE_HOST_BRIDGE,
> +    .parent = TYPE_PCI_HOST_BRIDGE,
> +    .abstract = true,
> +    .instance_size = 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"
>  
> +#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;
>  
> -- 
> 1.7.1
diff mbox

Patch

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 = {
+    .name = TYPE_PCIE_HOST_BRIDGE,
+    .parent = TYPE_PCI_HOST_BRIDGE,
+    .abstract = true,
+    .instance_size = 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"
 
+#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;