From patchwork Mon Aug 24 16:42:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31970 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 2C2CAB7B6A for ; Tue, 25 Aug 2009 03:19:17 +1000 (EST) Received: from localhost ([127.0.0.1]:56037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MfdCM-0006vG-9B for incoming@patchwork.ozlabs.org; Mon, 24 Aug 2009 13:19:14 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mfcfs-0000ym-Bo 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 1Mfcfn-0000px-8d for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:39 -0400 Received: from [199.232.76.173] (port=33811 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mfcfm-0000pR-Jb for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19126) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mfcfl-00034J-SM for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:34 -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 n7OGjXoL020820 for ; Mon, 24 Aug 2009 12:45:33 -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 n7OGjKU1024317; Mon, 24 Aug 2009 12:45:32 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 24 Aug 2009 18:42:43 +0200 Message-Id: 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 09/26] lsi53c895a: rename PCIDevice field from pci_dev to dev (consistence) 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 | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index 7ebf452..d154b23 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -175,7 +175,7 @@ typedef struct { } lsi_queue; typedef struct { - PCIDevice pci_dev; + PCIDevice dev; int mmio_io_addr; int ram_io_addr; uint32_t script_ram_base; @@ -410,7 +410,7 @@ static void lsi_update_irq(LSIState *s) level, s->dstat, s->sist1, s->sist0); last_level = level; } - qemu_set_irq(s->pci_dev.irq[0], level); + qemu_set_irq(s->dev.irq[0], level); } /* Stop SCRIPTS execution and raise a SCSI interrupt. */ @@ -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 = DO_UPCAST(LSIState, pci_dev, pci_dev); + LSIState *s = DO_UPCAST(LSIState, 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 = DO_UPCAST(LSIState, pci_dev, pci_dev); + LSIState *s = DO_UPCAST(LSIState, 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 = DO_UPCAST(LSIState, pci_dev, pci_dev); + LSIState *s = DO_UPCAST(LSIState, dev, pci_dev); DPRINTF("Mapping registers at %08x\n", addr); cpu_register_physical_memory(addr + 0, 0x400, s->mmio_io_addr); @@ -1980,7 +1980,7 @@ void lsi_scsi_attach(DeviceState *host, BlockDriverState *bd, int id) s->scsi_dev[id] = scsi_generic_init(bd, 1, lsi_command_complete, s); if (s->scsi_dev[id] == NULL) s->scsi_dev[id] = scsi_disk_init(bd, 1, lsi_command_complete, s); - bd->private = &s->pci_dev; + bd->private = &s->dev; } static void lsi_scsi_save(QEMUFile *f, void *opaque) @@ -1991,7 +1991,7 @@ static void lsi_scsi_save(QEMUFile *f, void *opaque) assert(s->current_dma_len == 0); assert(s->active_commands == 0); - pci_device_save(&s->pci_dev, f); + pci_device_save(&s->dev, f); qemu_put_sbe32s(f, &s->carry); qemu_put_sbe32s(f, &s->sense); @@ -2074,7 +2074,7 @@ static int lsi_scsi_load(QEMUFile *f, void *opaque, int version_id) return -EINVAL; } - if ((ret = pci_device_load(&s->pci_dev, f)) < 0) + if ((ret = pci_device_load(&s->dev, f)) < 0) return ret; qemu_get_sbe32s(f, &s->carry); @@ -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 = DO_UPCAST(LSIState, pci_dev, d); + LSIState *s = DO_UPCAST(LSIState, dev, d); cpu_unregister_io_memory(s->mmio_io_addr); cpu_unregister_io_memory(s->ram_io_addr); @@ -2165,10 +2165,10 @@ static int lsi_scsi_uninit(PCIDevice *d) static void lsi_scsi_init(PCIDevice *dev) { - LSIState *s = DO_UPCAST(LSIState, pci_dev, dev); + LSIState *s = DO_UPCAST(LSIState, dev, dev); uint8_t *pci_conf; - pci_conf = s->pci_dev.config; + pci_conf = s->dev.config; /* PCI Vendor ID (word) */ pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_LSI_LOGIC); @@ -2198,7 +2198,7 @@ static void lsi_scsi_init(PCIDevice *dev) s->queue = qemu_malloc(sizeof(lsi_queue)); s->queue_len = 1; s->active_commands = 0; - s->pci_dev.unregister = lsi_scsi_uninit; + s->dev.unregister = lsi_scsi_uninit; lsi_soft_reset(s);