[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 167/173] opencores_eth: QOM cast cleanup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 167/173] opencores_eth: QOM cast cleanup |
Date: |
Mon, 29 Jul 2013 21:20:24 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/net/opencores_eth.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c
index 513f345..4118d54 100644
--- a/hw/net/opencores_eth.c
+++ b/hw/net/opencores_eth.c
@@ -267,8 +267,12 @@ typedef struct desc {
#define DEFAULT_PHY 1
+#define TYPE_OPEN_ETH "open_eth"
+#define OPEN_ETH(obj) OBJECT_CHECK(OpenEthState, (obj), TYPE_OPEN_ETH)
+
typedef struct OpenEthState {
- SysBusDevice dev;
+ SysBusDevice parent_obj;
+
NICState *nic;
NICConf conf;
MemoryRegion reg_io;
@@ -677,28 +681,30 @@ static const MemoryRegionOps open_eth_desc_ops = {
.write = open_eth_desc_write,
};
-static int sysbus_open_eth_init(SysBusDevice *dev)
+static int sysbus_open_eth_init(SysBusDevice *sbd)
{
- OpenEthState *s = DO_UPCAST(OpenEthState, dev, dev);
+ DeviceState *dev = DEVICE(sbd);
+ OpenEthState *s = OPEN_ETH(dev);
memory_region_init_io(&s->reg_io, OBJECT(dev), &open_eth_reg_ops, s,
"open_eth.regs", 0x54);
- sysbus_init_mmio(dev, &s->reg_io);
+ sysbus_init_mmio(sbd, &s->reg_io);
memory_region_init_io(&s->desc_io, OBJECT(dev), &open_eth_desc_ops, s,
"open_eth.desc", 0x400);
- sysbus_init_mmio(dev, &s->desc_io);
+ sysbus_init_mmio(sbd, &s->desc_io);
- sysbus_init_irq(dev, &s->irq);
+ sysbus_init_irq(sbd, &s->irq);
s->nic = qemu_new_nic(&net_open_eth_info, &s->conf,
- object_get_typename(OBJECT(s)), s->dev.qdev.id, s);
+ object_get_typename(OBJECT(s)), dev->id, s);
return 0;
}
static void qdev_open_eth_reset(DeviceState *dev)
{
- OpenEthState *d = DO_UPCAST(OpenEthState, dev.qdev, dev);
+ OpenEthState *d = OPEN_ETH(dev);
+
open_eth_reset(d);
}
@@ -720,7 +726,7 @@ static void open_eth_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo open_eth_info = {
- .name = "open_eth",
+ .name = TYPE_OPEN_ETH,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(OpenEthState),
.class_init = open_eth_class_init,
--
1.8.1.4
- [Qemu-devel] [PULL 170/173] kvm/ioapic: QOM cast cleanup, (continued)
- [Qemu-devel] [PULL 170/173] kvm/ioapic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 100/173] pl190: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 101/173] puv3_intc: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 117/173] zynq_slcr: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 166/173] exynos4210_i2c: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 102/173] realview_gic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 120/173] etraxfs_eth: Rename fs_eth to ETRAXFSEthState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 104/173] xilinx_intc: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 098/173] omap_intc: QOM'ify omap-intc and omap2-intc, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 121/173] lan9118: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 167/173] opencores_eth: QOM cast cleanup,
Andreas Färber <=
- [Qemu-devel] [PULL 119/173] etraxfs_eth: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 172/173] spapr_pci: QOM cast cleanup, Andreas Färber, 2013/07/29