From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Pog-0002of-Qa for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:47:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1Poe-0003tj-11 for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:46:58 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45792 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Pod-0003tV-NF for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:46:55 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 23 Jul 2013 01:46:02 +0200 Message-Id: <1374536796-13983-22-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 21/55] display/vmware_vga: 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 standard QOM cast macro. Remove usages of DO_UPCAST() and direct -> style casting. Signed-off-by: Peter Crosthwaite [AF: Renamed to TYPE_VMWARE_VGA and VMWARE_VGA()] Signed-off-by: Andreas F=C3=A4rber --- hw/display/vmware_vga.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 714908f..32637e7 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -81,6 +81,11 @@ struct vmsvga_state_s { int redraw_fifo_first, redraw_fifo_last; }; =20 +#define TYPE_VMWARE_SVGA "vmware-svga" + +#define VMWARE_SVGA(obj) \ + OBJECT_CHECK(struct pci_vmsvga_state_s, (obj), TYPE_VMWARE_SVGA) + struct pci_vmsvga_state_s { PCIDevice card; struct vmsvga_state_s chip; @@ -1092,8 +1097,7 @@ static void vmsvga_update_display(void *opaque) =20 static void vmsvga_reset(DeviceState *dev) { - struct pci_vmsvga_state_s *pci =3D - DO_UPCAST(struct pci_vmsvga_state_s, card.qdev, dev); + struct pci_vmsvga_state_s *pci =3D VMWARE_SVGA(dev); struct vmsvga_state_s *s =3D &pci->chip; =20 s->index =3D 0; @@ -1250,8 +1254,7 @@ static const MemoryRegionOps vmsvga_io_ops =3D { =20 static int pci_vmsvga_initfn(PCIDevice *dev) { - struct pci_vmsvga_state_s *s =3D - DO_UPCAST(struct pci_vmsvga_state_s, card, dev); + struct pci_vmsvga_state_s *s =3D VMWARE_SVGA(dev); =20 s->card.config[PCI_CACHE_LINE_SIZE] =3D 0x08; /* Cache line = size */ s->card.config[PCI_LATENCY_TIMER] =3D 0x40; /* Latency tim= er */ @@ -1303,7 +1306,7 @@ static void vmsvga_class_init(ObjectClass *klass, v= oid *data) } =20 static const TypeInfo vmsvga_info =3D { - .name =3D "vmware-svga", + .name =3D TYPE_VMWARE_SVGA, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(struct pci_vmsvga_state_s), .class_init =3D vmsvga_class_init, --=20 1.8.1.4