From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MeTiX-00023y-4v for qemu-devel@nongnu.org; Fri, 21 Aug 2009 08:59:41 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MeTiS-00022X-H6 for qemu-devel@nongnu.org; Fri, 21 Aug 2009 08:59:40 -0400 Received: from [199.232.76.173] (port=33774 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MeTiR-00022A-T4 for qemu-devel@nongnu.org; Fri, 21 Aug 2009 08:59:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42627) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MeTiR-0006IS-30 for qemu-devel@nongnu.org; Fri, 21 Aug 2009 08:59:35 -0400 Received: from int-mx07.intmail.prod.int.phx2.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7LCxXYR018614 for ; Fri, 21 Aug 2009 08:59:33 -0400 From: Juan Quintela Date: Fri, 21 Aug 2009 14:57:19 +0200 Message-Id: <1250859439-26724-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH] e100 cleanup List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Remove un needed casts from void *. Use DO_UPCAST() instead of blind casts Signed-off-by: Juan Quintela --- hw/e1000.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index b0542d7..85cfbb0 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -897,7 +897,7 @@ enum { MAC_NARRAYS = ARRAY_SIZE(mac_regarraystosave) }; static void nic_save(QEMUFile *f, void *opaque) { - E1000State *s = (E1000State *)opaque; + E1000State *s = opaque; int i, j; pci_device_save(&s->dev, f); @@ -940,7 +940,7 @@ nic_save(QEMUFile *f, void *opaque) static int nic_load(QEMUFile *f, void *opaque, int version_id) { - E1000State *s = (E1000State *)opaque; + E1000State *s = opaque; int i, j, ret; if ((ret = pci_device_load(&s->dev, f)) < 0) @@ -1032,7 +1032,7 @@ static void e1000_mmio_map(PCIDevice *pci_dev, int region_num, uint32_t addr, uint32_t size, int type) { - E1000State *d = (E1000State *)pci_dev; + E1000State *d = DO_UPCAST(E1000State, dev, pci_dev); int i; const uint32_t excluded_regs[] = { E1000_MDIC, E1000_ICR, E1000_ICS, E1000_IMS, @@ -1062,7 +1062,7 @@ e1000_cleanup(VLANClientState *vc) static int pci_e1000_uninit(PCIDevice *dev) { - E1000State *d = (E1000State *) dev; + E1000State *d = DO_UPCAST(E1000State, dev, dev); cpu_unregister_io_memory(d->mmio_index); @@ -1083,7 +1083,7 @@ static void e1000_reset(void *opaque) static void pci_e1000_init(PCIDevice *pci_dev) { - E1000State *d = (E1000State *)pci_dev; + E1000State *d = DO_UPCAST(E1000State, dev, pci_dev); uint8_t *pci_conf; uint16_t checksum = 0; static const char info_str[] = "e1000"; -- 1.6.2.5