[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 23/26] pcnet: Change casts to DO_UPCAST() for PCIPCN
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 23/26] pcnet: Change casts to DO_UPCAST() for PCIPCNetState |
Date: |
Mon, 24 Aug 2009 18:42:57 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/pcnet.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/pcnet.c b/hw/pcnet.c
index 637dcfb..23a577e 100644
--- a/hw/pcnet.c
+++ b/hw/pcnet.c
@@ -1764,7 +1764,7 @@ static uint32_t pcnet_ioport_readl(void *opaque, uint32_t
addr)
static void pcnet_ioport_map(PCIDevice *pci_dev, int region_num,
uint32_t addr, uint32_t size, int type)
{
- PCNetState *d = &((PCIPCNetState *)pci_dev)->state;
+ PCNetState *d = &DO_UPCAST(PCIPCNetState, pci_dev, pci_dev)->state;
#ifdef PCNET_DEBUG_IO
printf("pcnet_ioport_map addr=0x%04x size=0x%04x\n", addr, size);
@@ -1978,7 +1978,7 @@ static CPUReadMemoryFunc *pcnet_mmio_read[] = {
static void pcnet_mmio_map(PCIDevice *pci_dev, int region_num,
uint32_t addr, uint32_t size, int type)
{
- PCIPCNetState *d = (PCIPCNetState *)pci_dev;
+ PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev, pci_dev);
#ifdef PCNET_DEBUG_IO
printf("pcnet_mmio_map addr=0x%08x 0x%08x\n", addr, size);
@@ -2008,7 +2008,7 @@ static void pci_pcnet_cleanup(VLANClientState *vc)
static int pci_pcnet_uninit(PCIDevice *dev)
{
- PCIPCNetState *d = (PCIPCNetState *)dev;
+ PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev, dev);
cpu_unregister_io_memory(d->state.mmio_index);
@@ -2017,7 +2017,7 @@ static int pci_pcnet_uninit(PCIDevice *dev)
static void pci_pcnet_init(PCIDevice *pci_dev)
{
- PCIPCNetState *d = (PCIPCNetState *)pci_dev;
+ PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev, pci_dev);
PCNetState *s = &d->state;
uint8_t *pci_conf;
--
1.6.2.5
- [Qemu-devel] [PATCH 14/26] usb-ohci: Change casts to DO_UPCAST() for OHCIPCIState, (continued)
- [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
- [Qemu-devel] [PATCH 20/26] cirrus_vga: remove pointless cast from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 22/26] Add pci_cirrus_vga_{save/load} functions, then remove vga.pci_dev use, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 24/26] pcnet: remove useless casts This are casts to the very type of the function, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 23/26] pcnet: Change casts to DO_UPCAST() for PCIPCNetState,
Juan Quintela <=
- [Qemu-devel] [PATCH 21/26] cirrus_vga: Change casts to DO_UPCAST() for PCICirrusVGAState, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 26/26] e1000 cleanup, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 25/26] pcnet: Add pci_pcnet_{save/load} functions, then remove PCNetState pci_dev field, Juan Quintela, 2009/08/24
- Re: [Qemu-devel] [PATCH 00/26] Indirection Cleanup, Gerd Hoffmann, 2009/08/25