From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58445)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1WKwBF-0005jA-4F
	for qemu-devel@nongnu.org; Tue, 04 Mar 2014 15:43:19 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1WKwB8-0004lP-Tp
	for qemu-devel@nongnu.org; Tue, 04 Mar 2014 15:43:13 -0500
Received: from cantor2.suse.de ([195.135.220.15]:38078 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1WKwB8-0004lH-OO
	for qemu-devel@nongnu.org; Tue, 04 Mar 2014 15:43:06 -0500
Message-ID: <53163AD7.9060502@suse.de>
Date: Tue, 04 Mar 2014 21:43:03 +0100
From: =?ISO-8859-15?Q?Andreas_F=E4rber?= <afaerber@suse.de>
MIME-Version: 1.0
References: <cover.1392164348.git.peter.crosthwaite@xilinx.com>
	<f6a7df858c39f336b240d6cd26d3c8fc75a1cd91.1392164348.git.peter.crosthwaite@xilinx.com>
In-Reply-To: <f6a7df858c39f336b240d6cd26d3c8fc75a1cd91.1392164348.git.peter.crosthwaite@xilinx.com>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH qom-next v1 2/6] ssi: Remove legacy
 SSI_BUS->BUS cast
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Crosthwaite <peter.crosthwaite@xilinx.com>, qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org

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.
>=20
> Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> ---
>=20
>  hw/ssi/ssi.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>=20
> 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 =3D {
> =20
>  DeviceState *ssi_create_slave_no_init(SSIBus *bus, const char *name)
>  {
> -    return qdev_create(&bus->qbus, name);
> +    return qdev_create(BUS(bus), name);
>  }
> =20
>  DeviceState *ssi_create_slave(SSIBus *bus, const char *name)
> @@ -156,7 +156,7 @@ static int ssi_auto_connect_slave(Object *child, vo=
id *opaque)
>      }
> =20
>      cs_line =3D 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 =3D 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 =3D BUS(bus);
     BusChild *kid;
     SSISlaveClass *ssc;
     uint32_t r =3D 0;

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

Cheers,
Andreas

--=20
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe=
rg