From patchwork Mon Aug 24 16:42:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31968 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 53D5FB7B63 for ; Tue, 25 Aug 2009 03:17:09 +1000 (EST) Received: from localhost ([127.0.0.1]:54923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MfdAI-0005iE-D3 for incoming@patchwork.ozlabs.org; Mon, 24 Aug 2009 13:17:06 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mfcfs-0000yd-76 for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:40 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mfcfm-0000oY-IR for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:39 -0400 Received: from [199.232.76.173] (port=33810 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mfcfl-0000nL-7c for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52916) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mfcfk-00033z-Km for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:32 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7OGjVVC020786 for ; Mon, 24 Aug 2009 12:45:31 -0400 Received: from localhost.localdomain (vpn1-4-157.ams2.redhat.com [10.36.4.157]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7OGjKU0024317; Mon, 24 Aug 2009 12:45:30 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 24 Aug 2009 18:42:42 +0200 Message-Id: <1556c732eabadd268531c56ee544019225adbb55.1251131364.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 08/26] lsi53c895a: use DO_UPCAST to cast from PCIDevice X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- hw/lsi53c895a.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index f8501d4..7ebf452 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -1927,7 +1927,7 @@ static void lsi_io_writel(void *opaque, uint32_t addr, uint32_t val) static void lsi_io_mapfunc(PCIDevice *pci_dev, int region_num, uint32_t addr, uint32_t size, int type) { - LSIState *s = (LSIState *)pci_dev; + LSIState *s = DO_UPCAST(LSIState, pci_dev, pci_dev); DPRINTF("Mapping IO at %08x\n", addr); @@ -1942,7 +1942,7 @@ static void lsi_io_mapfunc(PCIDevice *pci_dev, int region_num, static void lsi_ram_mapfunc(PCIDevice *pci_dev, int region_num, uint32_t addr, uint32_t size, int type) { - LSIState *s = (LSIState *)pci_dev; + LSIState *s = DO_UPCAST(LSIState, pci_dev, pci_dev); DPRINTF("Mapping ram at %08x\n", addr); s->script_ram_base = addr; @@ -1952,7 +1952,7 @@ static void lsi_ram_mapfunc(PCIDevice *pci_dev, int region_num, static void lsi_mmio_mapfunc(PCIDevice *pci_dev, int region_num, uint32_t addr, uint32_t size, int type) { - LSIState *s = (LSIState *)pci_dev; + LSIState *s = DO_UPCAST(LSIState, pci_dev, pci_dev); DPRINTF("Mapping registers at %08x\n", addr); cpu_register_physical_memory(addr + 0, 0x400, s->mmio_io_addr); @@ -2153,7 +2153,7 @@ static int lsi_scsi_load(QEMUFile *f, void *opaque, int version_id) static int lsi_scsi_uninit(PCIDevice *d) { - LSIState *s = (LSIState *) d; + LSIState *s = DO_UPCAST(LSIState, pci_dev, d); cpu_unregister_io_memory(s->mmio_io_addr); cpu_unregister_io_memory(s->ram_io_addr); @@ -2165,7 +2165,7 @@ static int lsi_scsi_uninit(PCIDevice *d) static void lsi_scsi_init(PCIDevice *dev) { - LSIState *s = (LSIState *)dev; + LSIState *s = DO_UPCAST(LSIState, pci_dev, dev); uint8_t *pci_conf; pci_conf = s->pci_dev.config;