[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next for-1.6 01/11] cadence_gem: QOM cast cleanu
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-next for-1.6 01/11] cadence_gem: QOM cast cleanup |
Date: |
Sat, 27 Jul 2013 12:44:52 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/net/cadence_gem.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index ac929cb..4a355bb 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -315,8 +315,12 @@ static inline void rx_desc_set_length(unsigned *desc,
unsigned len)
desc[1] |= len;
}
-typedef struct {
- SysBusDevice busdev;
+#define TYPE_CADENCE_GEM "cadence_gem"
+#define GEM(obj) OBJECT_CHECK(GemState, (obj), TYPE_CADENCE_GEM)
+
+typedef struct GemState {
+ SysBusDevice parent_obj;
+
MemoryRegion iomem;
NICState *nic;
NICConf conf;
@@ -945,7 +949,7 @@ static void gem_phy_reset(GemState *s)
static void gem_reset(DeviceState *d)
{
- GemState *s = FROM_SYSBUS(GemState, SYS_BUS_DEVICE(d));
+ GemState *s = GEM(d);
DB_PRINT("\n");
@@ -1155,22 +1159,22 @@ static NetClientInfo net_gem_info = {
.link_status_changed = gem_set_link,
};
-static int gem_init(SysBusDevice *dev)
+static int gem_init(SysBusDevice *sbd)
{
- GemState *s;
+ DeviceState *dev = DEVICE(sbd);
+ GemState *s = GEM(dev);
DB_PRINT("\n");
- s = FROM_SYSBUS(GemState, dev);
gem_init_register_masks(s);
memory_region_init_io(&s->iomem, OBJECT(s), &gem_ops, s,
"enet", sizeof(s->regs));
- sysbus_init_mmio(dev, &s->iomem);
- sysbus_init_irq(dev, &s->irq);
+ sysbus_init_mmio(sbd, &s->iomem);
+ sysbus_init_irq(sbd, &s->irq);
qemu_macaddr_default_if_unset(&s->conf.macaddr);
s->nic = qemu_new_nic(&net_gem_info, &s->conf,
- object_get_typename(OBJECT(dev)), dev->qdev.id, s);
+ object_get_typename(OBJECT(dev)), dev->id, s);
return 0;
}
@@ -1206,10 +1210,10 @@ static void gem_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo gem_info = {
- .class_init = gem_class_init,
- .name = "cadence_gem",
+ .name = TYPE_CADENCE_GEM,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(GemState),
+ .class_init = gem_class_init,
};
static void gem_register_types(void)
--
1.8.1.4
- [Qemu-devel] [PATCH qom-next for-1.6 00/11] net: QOM cast cleanups, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 11/11] xilinx_ethlite: QOM cast cleanup, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 06/11] milkymist-minimac2: QOM cast cleanup, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 04/11] lan9118: QOM cast cleanup, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 10/11] xgmac: QOM cast cleanup, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 09/11] stellaris_enet: NetClientInfo::cleanup fixes, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 01/11] cadence_gem: QOM cast cleanup,
Andreas Färber <=
- [Qemu-devel] [PATCH qom-next for-1.6 08/11] stellaris_enet: QOM cast cleanup, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 05/11] lance: QOM cast cleanup, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 02/11] etraxfs_eth: QOM cast cleanup, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 03/11] etraxfs_eth: Rename fs_eth to ETRAXFSEthState, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 07/11] smc91c111: QOM cast cleanup, Andreas Färber, 2013/07/27