From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Poa-0002a4-LO for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:46:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1PoY-0003q3-ME for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:46:52 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45765 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1PoY-0003pl-AR for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:46:50 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 23 Jul 2013 01:45:52 +0200 Message-Id: <1374536796-13983-12-git-send-email-afaerber@suse.de> In-Reply-To: <1374536796-13983-1-git-send-email-afaerber@suse.de> References: <1374536796-13983-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 11/55] scsi/megasas: QOM Upcast Sweep List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Peter Crosthwaite Define and use standard QOM cast macro. Remove usages of DO_UPCAST() and direct -> style upcasting. Signed-off-by: Peter Crosthwaite Signed-off-by: Andreas F=C3=A4rber --- hw/scsi/megasas.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 45d0c77..0f2a722 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -108,6 +108,11 @@ typedef struct MegasasState { SCSIBus bus; } MegasasState; =20 +#define TYPE_MEGASAS "megasas" + +#define MEGASAS(obj) \ + OBJECT_CHECK(MegasasState, (obj), TYPE_MEGASAS) + #define MEGASAS_INTR_DISABLED_MASK 0xFFFFFFFF =20 static bool megasas_intr_enabled(MegasasState *s) @@ -2039,7 +2044,7 @@ static void megasas_soft_reset(MegasasState *s) =20 static void megasas_scsi_reset(DeviceState *dev) { - MegasasState *s =3D DO_UPCAST(MegasasState, dev.qdev, dev); + MegasasState *s =3D MEGASAS(dev); =20 megasas_soft_reset(s); } @@ -2064,7 +2069,7 @@ static const VMStateDescription vmstate_megasas =3D= { =20 static void megasas_scsi_uninit(PCIDevice *d) { - MegasasState *s =3D DO_UPCAST(MegasasState, dev, d); + MegasasState *s =3D MEGASAS(d); =20 #ifdef USE_MSIX msix_uninit(&s->dev, &s->mmio_io); @@ -2087,7 +2092,7 @@ static const struct SCSIBusInfo megasas_scsi_info =3D= { =20 static int megasas_scsi_init(PCIDevice *dev) { - MegasasState *s =3D DO_UPCAST(MegasasState, dev, dev); + MegasasState *s =3D MEGASAS(dev); uint8_t *pci_conf; int i, bar_type; =20 @@ -2158,7 +2163,7 @@ static int megasas_scsi_init(PCIDevice *dev) s->frames[i].state =3D s; } =20 - scsi_bus_new(&s->bus, &dev->qdev, &megasas_scsi_info, NULL); + scsi_bus_new(&s->bus, DEVICE(dev), &megasas_scsi_info, NULL); scsi_bus_legacy_handle_cmdline(&s->bus); return 0; } @@ -2198,7 +2203,7 @@ static void megasas_class_init(ObjectClass *oc, voi= d *data) } =20 static const TypeInfo megasas_info =3D { - .name =3D "megasas", + .name =3D TYPE_MEGASAS, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(MegasasState), .class_init =3D megasas_class_init, --=20 1.8.1.4