[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/22] ne2000: change pci_dev to is_pci
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 08/22] ne2000: change pci_dev to is_pci |
Date: |
Mon, 24 Aug 2009 13:03:29 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/ne2000.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/ne2000.c b/hw/ne2000.c
index 7ac4fd3..33477b6 100644
--- a/hw/ne2000.c
+++ b/hw/ne2000.c
@@ -142,7 +142,7 @@ typedef struct NE2000State {
uint8_t mult[8]; /* multicast mask array */
qemu_irq irq;
int isa_io_base;
- PCIDevice *pci_dev;
+ int is_pci;
VLANClientState *vc;
uint8_t macaddr[6];
uint8_t mem[NE2000_MEM_SIZE];
@@ -654,8 +654,8 @@ static void ne2000_save(QEMUFile* f,void* opaque)
NE2000State* s = opaque;
uint32_t tmp;
- if (s->pci_dev)
- pci_device_save(s->pci_dev, f);
+ if (s->is_pci)
+ pci_device_save(&s->dev, f);
qemu_put_8s(f, &s->rxcr);
@@ -689,8 +689,8 @@ static int ne2000_load(QEMUFile* f,void* opaque,int
version_id)
if (version_id > 3)
return -EINVAL;
- if (s->pci_dev && version_id >= 3) {
- ret = pci_device_load(s->pci_dev, f);
+ if (s->is_pci && version_id >= 3) {
+ ret = pci_device_load(&s->dev, f);
if (ret < 0)
return ret;
}
@@ -813,7 +813,7 @@ static void pci_ne2000_init(PCIDevice *pci_dev)
pci_register_bar(&s->dev, 0, 0x100,
PCI_ADDRESS_SPACE_IO, ne2000_map);
s->irq = s->dev.irq[0];
- s->pci_dev = &s->dev;
+ s->is_pci = 1;
qdev_get_macaddr(&s->dev.qdev, s->macaddr);
ne2000_reset(s);
s->vc = qdev_get_vlan_client(&s->dev.qdev,
--
1.6.2.5
- Re: [Qemu-devel] [PATCH 01/22] eepro100: convert casts to DO_UPCAST(), (continued)
- [Qemu-devel] [PATCH 03/22] eepro100: Remove unused indirection of PCIDevice, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 04/22] es1370: Remove unused indirection of PCIES1370State and ES1370State, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 07/22] ne2000: Remove unneeded double indirection of PCINE2000State, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 05/22] ne2000: remove casts from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 06/22] ne2000: pci_dev has this very value with the right type, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 09/22] pci: remove casts from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 08/22] ne2000: change pci_dev to is_pci,
Juan Quintela <=
- [Qemu-devel] [PATCH 11/22] rtl8139: remove pointless cast from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 10/22] rtl8139: Remove unneeded double indirection of PCIRTL8139State, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 12/22] lsi53c895a: remove pointless cast from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 13/22] lsi53c895a: use DO_UPCAST to cast from PCIDevice, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 14/22] lsi53c895a: rename PCIDevice field from pci_dev to dev (consistence), Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 15/22] lsi53c895a: LSIState is a PCIDevice is a DeviceHost, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 16/22] usb-ohci: Remove unneeded double indirection of OHCIPCIState, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 17/22] cirrus_vga: Remove unneeded double indirection of PCICirrusVGAState, Juan Quintela, 2009/08/24