Re: [Qemu-devel] [PATCH qom-next v1 2/6] ssi: Remove legacy SSI_BUS->BUS cast

[Andreas Färber]

Am 12.02.2014 01:28, schrieb Peter Crosthwaite:
> Remove two legacy ->qbus style casts from TYPE_SSI_BUS to TYPE_BUS in
> ssi.c.
> 
> Signed-off-by: Peter Crosthwaite <address@hidden>
> ---
> 
>  hw/ssi/ssi.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c
> index 2c25260..f2bdf30 100644
> --- a/hw/ssi/ssi.c
> +++ b/hw/ssi/ssi.c
> @@ -88,7 +88,7 @@ static const TypeInfo ssi_slave_info = {
>  
>  DeviceState *ssi_create_slave_no_init(SSIBus *bus, const char *name)
>  {
> -    return qdev_create(&bus->qbus, name);
> +    return qdev_create(BUS(bus), name);
>  }
>  
>  DeviceState *ssi_create_slave(SSIBus *bus, const char *name)
> @@ -156,7 +156,7 @@ static int ssi_auto_connect_slave(Object *child, void 
> *opaque)
>      }
>  
>      cs_line = qdev_get_gpio_in(DEVICE(dev), 0);
> -    qdev_set_parent_bus(DEVICE(dev), &arg->bus->qbus);
> +    qdev_set_parent_bus(DEVICE(dev), BUS(arg->bus));
>      **arg->cs_linep = cs_line;
>      (*arg->cs_linep)++;
>      return 0;

Let's be consequent and add this:

diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c
index f2bdf30..7be7c53 100644
--- a/hw/ssi/ssi.c
+++ b/hw/ssi/ssi.c
@@ -15,7 +15,7 @@
 #include "hw/ssi.h"

 struct SSIBus {
-    BusState qbus;
+    BusState parent_obj;
 };

 #define TYPE_SSI_BUS "SSI"
@@ -108,11 +108,12 @@ SSIBus *ssi_create_bus(DeviceState *parent, const
char *name)

 uint32_t ssi_transfer(SSIBus *bus, uint32_t val)
 {
+    BusState *b = BUS(bus);
     BusChild *kid;
     SSISlaveClass *ssc;
     uint32_t r = 0;

-    QTAILQ_FOREACH(kid, &bus->qbus.children, sibling) {
+    QTAILQ_FOREACH(kid, &b->children, sibling) {
         SSISlave *slave = SSI_SLAVE(kid->child);
         ssc = SSI_SLAVE_GET_CLASS(slave);
         r |= ssc->transfer_raw(slave, val);

Cheers,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg