From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3szt-0001lf-Q7 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:20:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3szo-00028E-BQ for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:20:45 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53190 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3szn-000284-Of for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:20:40 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:17:39 +0200 Message-Id: <1375125630-24869-3-git-send-email-afaerber@suse.de> In-Reply-To: <1375125630-24869-1-git-send-email-afaerber@suse.de> References: <1375125630-24869-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 002/173] ide/piix: QOM casting sweep List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Peter Crosthwaite Use standard QOM cast macro. Remove usage of DO_UPCAST() and direct -> style upcasting. Signed-off-by: Peter Crosthwaite Signed-off-by: Andreas F=C3=A4rber --- hw/ide/piix.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 56cf00e..238e758 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -135,7 +135,7 @@ static void pci_piix_init_ports(PCIIDEState *d) { int i; =20 for (i =3D 0; i < 2; i++) { - ide_bus_new(&d->bus[i], &d->dev.qdev, i, 2); + ide_bus_new(&d->bus[i], DEVICE(d), i, 2); ide_init_ioport(&d->bus[i], NULL, port_info[i].iobase, port_info[i].iobase2); ide_init2(&d->bus[i], isa_get_irq(NULL, port_info[i].isairq)); @@ -159,7 +159,7 @@ static int pci_piix_ide_initfn(PCIDevice *dev) bmdma_setup_bar(d); pci_register_bar(&d->dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_ba= r); =20 - vmstate_register(&d->dev.qdev, 0, &vmstate_ide_pci, d); + vmstate_register(DEVICE(dev), 0, &vmstate_ide_pci, d); =20 pci_piix_init_ports(d); =20 @@ -173,7 +173,7 @@ static int pci_piix3_xen_ide_unplug(DeviceState *dev) DriveInfo *di; int i =3D 0; =20 - pci_dev =3D DO_UPCAST(PCIDevice, qdev, dev); + pci_dev =3D PCI_DEVICE(dev); pci_ide =3D DO_UPCAST(PCIIDEState, dev, pci_dev); =20 for (; i < 3; i++) { @@ -188,7 +188,7 @@ static int pci_piix3_xen_ide_unplug(DeviceState *dev) drive_put_ref(di); } } - qdev_reset_all(&(pci_ide->dev.qdev)); + qdev_reset_all(DEVICE(dev)); return 0; } =20 --=20 1.8.1.4