From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNqPm-000832-Sw for qemu-devel@nongnu.org; Wed, 12 Mar 2014 17:10:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNqPe-0008Tl-Q9 for qemu-devel@nongnu.org; Wed, 12 Mar 2014 17:10:14 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45524 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNqPe-0008SW-J0 for qemu-devel@nongnu.org; Wed, 12 Mar 2014 17:10:06 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 12 Mar 2014 22:09:40 +0100 Message-Id: <1394658603-13650-9-git-send-email-afaerber@suse.de> In-Reply-To: <1394658603-13650-1-git-send-email-afaerber@suse.de> References: <1394658603-13650-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL for-2.0-rc0 08/31] misc/max111x: QOM casting sweep List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Peter Crosthwaite Define and use QOM cast macro. Removes some usages of legacy casting systems. Signed-off-by: Peter Crosthwaite [AF: Rename parent field] Signed-off-by: Andreas F=C3=A4rber --- hw/misc/max111x.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c index 1b5da69..bba87c2 100644 --- a/hw/misc/max111x.c +++ b/hw/misc/max111x.c @@ -13,7 +13,8 @@ #include "hw/ssi.h" =20 typedef struct { - SSISlave ssidev; + SSISlave parent_obj; + qemu_irq interrupt; uint8_t tb1, rb2, rb3; int cycle; @@ -24,6 +25,9 @@ typedef struct { =20 #define TYPE_MAX_111X "max111x" =20 +#define MAX_111X(obj) \ + OBJECT_CHECK(MAX111xState, (obj), TYPE_MAX_111X) + #define TYPE_MAX_1110 "max1110" #define TYPE_MAX_1111 "max1111" =20 @@ -97,7 +101,7 @@ static void max111x_write(MAX111xState *s, uint32_t va= lue) =20 static uint32_t max111x_transfer(SSISlave *dev, uint32_t value) { - MAX111xState *s =3D FROM_SSI_SLAVE(MAX111xState, dev); + MAX111xState *s =3D MAX_111X(dev); max111x_write(s, value); return max111x_read(s); } @@ -108,7 +112,7 @@ static const VMStateDescription vmstate_max111x =3D { .minimum_version_id =3D 1, .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_SSI_SLAVE(ssidev, MAX111xState), + VMSTATE_SSI_SLAVE(parent_obj, MAX111xState), VMSTATE_UINT8(tb1, MAX111xState), VMSTATE_UINT8(rb2, MAX111xState), VMSTATE_UINT8(rb3, MAX111xState), @@ -123,7 +127,7 @@ static const VMStateDescription vmstate_max111x =3D { static int max111x_init(SSISlave *d, int inputs) { DeviceState *dev =3D DEVICE(d); - MAX111xState *s =3D FROM_SSI_SLAVE(MAX111xState, d); + MAX111xState *s =3D MAX_111X(dev); =20 qdev_init_gpio_out(dev, &s->interrupt, 1); =20 @@ -155,7 +159,7 @@ static int max1111_init(SSISlave *dev) =20 void max111x_set_input(DeviceState *dev, int line, uint8_t value) { - MAX111xState *s =3D FROM_SSI_SLAVE(MAX111xState, SSI_SLAVE_FROM_QDEV= (dev)); + MAX111xState *s =3D MAX_111X(dev); assert(line >=3D 0 && line < s->inputs); s->input[line] =3D value; } --=20 1.8.4.5