OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

net/pcnet-pci: QOM Upcast Sweep

Browse Source 
Define and use standard QOM cast macro. Remove usages of DO_UPCAST()
and direct -> style upcasting.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
[AF: Renamed parent field, renamed from PC_NET to PCNET]
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Peter Crosthwaite 2013-06-24 16:52:00 +10:00 committed by Andreas Färber
parent 88a411a8a0
commit 1f8c794685
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/net/pcnet-pci.c
View File

@ -43,9 +43,16 @@
//#define PCNET_DEBUG_TMD //#define PCNET_DEBUG_TMD
//#define PCNET_DEBUG_MATCH //#define PCNET_DEBUG_MATCH
#define TYPE_PCI_PCNET "pcnet"
#define PCI_PCNET(obj) \
OBJECT_CHECK(PCIPCNetState, (obj), TYPE_PCI_PCNET)
typedef struct { typedef struct {
PCIDevice pci_dev; /*< private >*/
PCIDevice parent_obj;
/*< public >*/
PCNetState state; PCNetState state;
MemoryRegion io_bar; MemoryRegion io_bar;
} PCIPCNetState; } PCIPCNetState;
@ -236,7 +243,7 @@ static const VMStateDescription vmstate_pci_pcnet = {
.minimum_version_id = 2, .minimum_version_id = 2,
.minimum_version_id_old = 2, .minimum_version_id_old = 2,
.fields = (VMStateField []) { .fields = (VMStateField []) {
VMSTATE_PCI_DEVICE(pci_dev, PCIPCNetState), VMSTATE_PCI_DEVICE(parent_obj, PCIPCNetState),
VMSTATE_STRUCT(state, PCIPCNetState, 0, vmstate_pcnet, PCNetState), VMSTATE_STRUCT(state, PCIPCNetState, 0, vmstate_pcnet, PCNetState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
@ -273,7 +280,7 @@ static void pci_pcnet_cleanup(NetClientState *nc)
static void pci_pcnet_uninit(PCIDevice *dev) static void pci_pcnet_uninit(PCIDevice *dev)
{ {
PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev, dev); PCIPCNetState *d = PCI_PCNET(dev);
memory_region_destroy(&d->state.mmio); memory_region_destroy(&d->state.mmio);
memory_region_destroy(&d->io_bar); memory_region_destroy(&d->io_bar);
@ -293,7 +300,7 @@ static NetClientInfo net_pci_pcnet_info = {
static int pci_pcnet_init(PCIDevice *pci_dev) static int pci_pcnet_init(PCIDevice *pci_dev)
{ {
PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev, pci_dev); PCIPCNetState *d = PCI_PCNET(pci_dev);
PCNetState *s = &d->state; PCNetState *s = &d->state;
uint8_t *pci_conf; uint8_t *pci_conf;
@ -329,12 +336,12 @@ static int pci_pcnet_init(PCIDevice *pci_dev)
s->phys_mem_write = pci_physical_memory_write; s->phys_mem_write = pci_physical_memory_write;
s->dma_opaque = pci_dev; s->dma_opaque = pci_dev;
return pcnet_common_init(&pci_dev->qdev, s, &net_pci_pcnet_info); return pcnet_common_init(DEVICE(pci_dev), s, &net_pci_pcnet_info);
} }
static void pci_reset(DeviceState *dev) static void pci_reset(DeviceState *dev)
{ {
PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev.qdev, dev); PCIPCNetState *d = PCI_PCNET(dev);
pcnet_h_reset(&d->state); pcnet_h_reset(&d->state);
} }
@ -362,7 +369,7 @@ static void pcnet_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo pcnet_info = { static const TypeInfo pcnet_info = {
.name = "pcnet", .name = TYPE_PCI_PCNET,
.parent = TYPE_PCI_DEVICE, .parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PCIPCNetState), .instance_size = sizeof(PCIPCNetState),
.class_init = pcnet_class_init, .class_init = pcnet_class_init,