[Qemu-devel] [PATCH] spapr vio: fix to incomplete QOMify

[Qemu-devel] [PATCH] spapr vio: fix to incomplete QOMify

[Cao jin]

Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
---
 hw/ppc/spapr_vio.c         | 12 +++++-------
 include/hw/ppc/spapr_vio.h |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index c51eb8e..46f3b8d 100644
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -388,7 +388,7 @@ static void rtas_quiesce(PowerPCCPU *cpu, sPAPRMachineState *spapr,
 
 static VIOsPAPRDevice *reg_conflict(VIOsPAPRDevice *dev)
 {
-    VIOsPAPRBus *bus = DO_UPCAST(VIOsPAPRBus, bus, dev->qdev.parent_bus);
+    VIOsPAPRBus *bus = SPAPR_VIO_BUS(dev->qdev.parent_bus);
     BusChild *kid;
     VIOsPAPRDevice *other;
 
@@ -449,7 +449,7 @@ static void spapr_vio_busdev_realize(DeviceState *qdev, Error **errp)
         }
     } else {
         /* Need to assign an address */
-        VIOsPAPRBus *bus = DO_UPCAST(VIOsPAPRBus, bus, dev->qdev.parent_bus);
+        VIOsPAPRBus *bus = SPAPR_VIO_BUS(dev->qdev.parent_bus);
 
         do {
             dev->reg = bus->next_reg++;
@@ -523,13 +523,12 @@ VIOsPAPRBus *spapr_vio_bus_init(void)
     DeviceState *dev;
 
     /* Create bridge device */
-    dev = qdev_create(NULL, "spapr-vio-bridge");
+    dev = qdev_create(NULL, TYPE_SPAPR_VIO_BRIDGE);
     qdev_init_nofail(dev);
 
     /* Create bus on bridge device */
-
     qbus = qbus_create(TYPE_SPAPR_VIO_BUS, dev, "spapr-vio");
-    bus = DO_UPCAST(VIOsPAPRBus, bus, qbus);
+    bus = SPAPR_VIO_BUS(qbus);
     bus->next_reg = 0x71000000;
 
     /* hcall-vio */
@@ -567,9 +566,8 @@ static void spapr_vio_bridge_class_init(ObjectClass *klass, void *data)
 }
 
 static const TypeInfo spapr_vio_bridge_info = {
-    .name          = "spapr-vio-bridge",
+    .name          = TYPE_SPAPR_VIO_BRIDGE,
     .parent        = TYPE_SYS_BUS_DEVICE,
-    .instance_size = sizeof(SysBusDevice),
     .class_init    = spapr_vio_bridge_class_init,
 };
 
diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h
index 2299a54..c9733e7 100644
--- a/include/hw/ppc/spapr_vio.h
+++ b/include/hw/ppc/spapr_vio.h
@@ -34,7 +34,7 @@
 #define TYPE_SPAPR_VIO_BUS "spapr-vio-bus"
 #define SPAPR_VIO_BUS(obj) OBJECT_CHECK(VIOsPAPRBus, (obj), TYPE_SPAPR_VIO_BUS)
 
-struct VIOsPAPRDevice;
+#define TYPE_SPAPR_VIO_BRIDGE "spapr-vio-bridge"
 
 typedef struct VIOsPAPR_CRQ {
     uint64_t qladdr;
-- 
2.1.0

Re: [Qemu-devel] [PATCH] spapr vio: fix to incomplete QOMify

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 2822 bytes --]

On Wed, Dec 23, 2015 at 07:30:12PM +0800, Cao jin wrote:
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>

Applied to my ppc-for-2.6 queue, thanks.

> ---
>  hw/ppc/spapr_vio.c         | 12 +++++-------
>  include/hw/ppc/spapr_vio.h |  2 +-
>  2 files changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
> index c51eb8e..46f3b8d 100644
> --- a/hw/ppc/spapr_vio.c
> +++ b/hw/ppc/spapr_vio.c
> @@ -388,7 +388,7 @@ static void rtas_quiesce(PowerPCCPU *cpu, sPAPRMachineState *spapr,
>  
>  static VIOsPAPRDevice *reg_conflict(VIOsPAPRDevice *dev)
>  {
> -    VIOsPAPRBus *bus = DO_UPCAST(VIOsPAPRBus, bus, dev->qdev.parent_bus);
> +    VIOsPAPRBus *bus = SPAPR_VIO_BUS(dev->qdev.parent_bus);
>      BusChild *kid;
>      VIOsPAPRDevice *other;
>  
> @@ -449,7 +449,7 @@ static void spapr_vio_busdev_realize(DeviceState *qdev, Error **errp)
>          }
>      } else {
>          /* Need to assign an address */
> -        VIOsPAPRBus *bus = DO_UPCAST(VIOsPAPRBus, bus, dev->qdev.parent_bus);
> +        VIOsPAPRBus *bus = SPAPR_VIO_BUS(dev->qdev.parent_bus);
>  
>          do {
>              dev->reg = bus->next_reg++;
> @@ -523,13 +523,12 @@ VIOsPAPRBus *spapr_vio_bus_init(void)
>      DeviceState *dev;
>  
>      /* Create bridge device */
> -    dev = qdev_create(NULL, "spapr-vio-bridge");
> +    dev = qdev_create(NULL, TYPE_SPAPR_VIO_BRIDGE);
>      qdev_init_nofail(dev);
>  
>      /* Create bus on bridge device */
> -
>      qbus = qbus_create(TYPE_SPAPR_VIO_BUS, dev, "spapr-vio");
> -    bus = DO_UPCAST(VIOsPAPRBus, bus, qbus);
> +    bus = SPAPR_VIO_BUS(qbus);
>      bus->next_reg = 0x71000000;
>  
>      /* hcall-vio */
> @@ -567,9 +566,8 @@ static void spapr_vio_bridge_class_init(ObjectClass *klass, void *data)
>  }
>  
>  static const TypeInfo spapr_vio_bridge_info = {
> -    .name          = "spapr-vio-bridge",
> +    .name          = TYPE_SPAPR_VIO_BRIDGE,
>      .parent        = TYPE_SYS_BUS_DEVICE,
> -    .instance_size = sizeof(SysBusDevice),
>      .class_init    = spapr_vio_bridge_class_init,
>  };
>  
> diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h
> index 2299a54..c9733e7 100644
> --- a/include/hw/ppc/spapr_vio.h
> +++ b/include/hw/ppc/spapr_vio.h
> @@ -34,7 +34,7 @@
>  #define TYPE_SPAPR_VIO_BUS "spapr-vio-bus"
>  #define SPAPR_VIO_BUS(obj) OBJECT_CHECK(VIOsPAPRBus, (obj), TYPE_SPAPR_VIO_BUS)
>  
> -struct VIOsPAPRDevice;
> +#define TYPE_SPAPR_VIO_BRIDGE "spapr-vio-bridge"
>  
>  typedef struct VIOsPAPR_CRQ {
>      uint64_t qladdr;

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]