david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/e1000: 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>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Peter Crosthwaite 2013-06-24 16:50:30 +10:00 committed by Andreas Färber
parent 6783ecf144
commit 567a3c9e7f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/net/e1000.c
View File

@ -138,6 +138,11 @@ typedef struct E1000State_st {
uint32_t compat_flags; uint32_t compat_flags;
} E1000State; } E1000State;
#define TYPE_E1000 "e1000"
#define E1000(obj) \
OBJECT_CHECK(E1000State, (obj), TYPE_E1000)
#define defreg(x) x = (E1000_##x>>2) #define defreg(x) x = (E1000_##x>>2)
enum { enum {
defreg(CTRL), defreg(EECD), defreg(EERD), defreg(GPRC), defreg(CTRL), defreg(EECD), defreg(EERD), defreg(GPRC),
@ -1298,7 +1303,7 @@ e1000_cleanup(NetClientState *nc)
static void static void
pci_e1000_uninit(PCIDevice *dev) pci_e1000_uninit(PCIDevice *dev)
{ {
E1000State *d = DO_UPCAST(E1000State, dev, dev); E1000State *d = E1000(dev);
qemu_del_timer(d->autoneg_timer); qemu_del_timer(d->autoneg_timer);
qemu_free_timer(d->autoneg_timer); qemu_free_timer(d->autoneg_timer);
@ -1318,7 +1323,8 @@ static NetClientInfo net_e1000_info = {
static int pci_e1000_init(PCIDevice *pci_dev) static int pci_e1000_init(PCIDevice *pci_dev)
{ {
E1000State *d = DO_UPCAST(E1000State, dev, pci_dev); DeviceState *dev = DEVICE(pci_dev);
E1000State *d = E1000(pci_dev);
uint8_t *pci_conf; uint8_t *pci_conf;
uint16_t checksum = 0; uint16_t checksum = 0;
int i; int i;
@ -1349,11 +1355,11 @@ static int pci_e1000_init(PCIDevice *pci_dev)
d->eeprom_data[EEPROM_CHECKSUM_REG] = checksum; d->eeprom_data[EEPROM_CHECKSUM_REG] = checksum;
d->nic = qemu_new_nic(&net_e1000_info, &d->conf, d->nic = qemu_new_nic(&net_e1000_info, &d->conf,
object_get_typename(OBJECT(d)), d->dev.qdev.id, d); object_get_typename(OBJECT(d)), dev->id, d);
qemu_format_nic_info_str(qemu_get_queue(d->nic), macaddr); qemu_format_nic_info_str(qemu_get_queue(d->nic), macaddr);
add_boot_device_path(d->conf.bootindex, &pci_dev->qdev, "/ethernet-phy@0"); add_boot_device_path(d->conf.bootindex, dev, "/ethernet-phy@0");
d->autoneg_timer = qemu_new_timer_ms(vm_clock, e1000_autoneg_timer, d); d->autoneg_timer = qemu_new_timer_ms(vm_clock, e1000_autoneg_timer, d);
@ -1362,7 +1368,7 @@ static int pci_e1000_init(PCIDevice *pci_dev)
static void qdev_e1000_reset(DeviceState *dev) static void qdev_e1000_reset(DeviceState *dev)
{ {
E1000State *d = DO_UPCAST(E1000State, dev.qdev, dev); E1000State *d = E1000(dev);
e1000_reset(d); e1000_reset(d);
} }
@ -1392,7 +1398,7 @@ static void e1000_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo e1000_info = { static const TypeInfo e1000_info = {
.name = "e1000", .name = TYPE_E1000,
.parent = TYPE_PCI_DEVICE, .parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(E1000State), .instance_size = sizeof(E1000State),
.class_init = e1000_class_init, .class_init = e1000_class_init,