From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Pof-0002ly-Is for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:47:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1Pod-0003tH-4S for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:46:57 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45789 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Poc-0003sw-PO for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:46:54 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 23 Jul 2013 01:46:00 +0200 Message-Id: <1374536796-13983-20-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 19/55] misc/pci-testdev: QOM Upcast 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 standard QOM cast macro. Remove usages of DO_UPCAST() and direct -> style upcasting. Signed-off-by: Peter Crosthwaite [AF: Replaced another DO_UPCAST()] Signed-off-by: Andreas F=C3=A4rber --- hw/misc/pci-testdev.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c index 8b0b73f..3fb15c0 100644 --- a/hw/misc/pci-testdev.c +++ b/hw/misc/pci-testdev.c @@ -83,6 +83,11 @@ typedef struct PCITestDevState { int current; } PCITestDevState; =20 +#define TYPE_PCI_TEST_DEV "pci-testdev" + +#define PCI_TEST_DEV(obj) \ + OBJECT_CHECK(PCITestDevState, (obj), TYPE_PCI_TEST_DEV) + #define IOTEST_IS_MEM(i) (strcmp(IOTEST_TYPE(i), "portio")) #define IOTEST_REGION(d, i) (IOTEST_IS_MEM(i) ? &(d)->mmio : &(d)->port= io) #define IOTEST_SIZE(i) (IOTEST_IS_MEM(i) ? IOTEST_MEMSIZE : IOTEST_IOSIZ= E) @@ -227,7 +232,7 @@ static const MemoryRegionOps pci_testdev_pio_ops =3D = { =20 static int pci_testdev_init(PCIDevice *pci_dev) { - PCITestDevState *d =3D DO_UPCAST(PCITestDevState, dev, pci_dev); + PCITestDevState *d =3D PCI_TEST_DEV(pci_dev); uint8_t *pci_conf; char *name; int r, i; @@ -274,7 +279,7 @@ static int pci_testdev_init(PCIDevice *pci_dev) static void pci_testdev_uninit(PCIDevice *dev) { - PCITestDevState *d =3D DO_UPCAST(PCITestDevState, dev, dev); + PCITestDevState *d =3D PCI_TEST_DEV(dev); int i; =20 pci_testdev_reset(d); @@ -291,7 +296,7 @@ pci_testdev_uninit(PCIDevice *dev) =20 static void qdev_pci_testdev_reset(DeviceState *dev) { - PCITestDevState *d =3D DO_UPCAST(PCITestDevState, dev.qdev, dev); + PCITestDevState *d =3D PCI_TEST_DEV(dev); pci_testdev_reset(d); } =20 @@ -311,7 +316,7 @@ static void pci_testdev_class_init(ObjectClass *klass= , void *data) } =20 static const TypeInfo pci_testdev_info =3D { - .name =3D "pci-testdev", + .name =3D TYPE_PCI_TEST_DEV, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCITestDevState), .class_init =3D pci_testdev_class_init, --=20 1.8.1.4