[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/26] lsi53c895a: rename PCIDevice field from pci_d
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 09/26] lsi53c895a: rename PCIDevice field from pci_dev to dev (consistence) |
Date: |
Mon, 24 Aug 2009 18:42:43 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
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);
--
1.6.2.5
- [Qemu-devel] [PATCH 00/26] Indirection Cleanup, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 01/26] eepro100: convert casts to DO_UPCAST(), Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 02/26] eepro100: cast a void * makes no sense, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 03/26] eepro100: Remove unused indirection of PCIDevice, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 04/26] pci: remove casts from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 05/26] rtl8139: Remove unneeded double indirection of PCIRTL8139State, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 06/26] rtl8139: remove pointless cast from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 07/26] lsi53c895a: remove pointless cast from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 08/26] lsi53c895a: use DO_UPCAST to cast from PCIDevice, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 09/26] lsi53c895a: rename PCIDevice field from pci_dev to dev (consistence),
Juan Quintela <=
- [Qemu-devel] [PATCH 10/26] lsi53c895a: LSIState is a DeviceHost, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 12/26] vga: Rename vga_state -> vga, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 11/26] Introduce vga_common_reset() to be able to typcheck vga_reset(), Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 14/26] usb-ohci: Change casts to DO_UPCAST() for OHCIPCIState, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 13/26] Everything outside of vga.c should use VGACommonState, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 15/26] ne2000: remove casts from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 16/26] ne2000: pci_dev has this very value with the right type, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 17/26] ne2000: Change casts to DO_UPCAST() for PCINE2000State, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 18/26] We need PCINE2000State for save/load functions, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 19/26] Add pci_ne2000_{save/load} functions, then remove pci_dev NE2000State field, Juan Quintela, 2009/08/24