[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH microblaze v1 3/6] net: xilinx_ethlite: Convert to r
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH microblaze v1 3/6] net: xilinx_ethlite: Convert to realize() |
Date: |
Thu, 29 May 2014 02:24:29 -0700 |
SysBusDevice::init is depracated. Convert to Object::init and
Device::realize as prescribed by QOM conventions.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
hw/net/xilinx_ethlite.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c
index 6cbd95d..5a434f6 100644
--- a/hw/net/xilinx_ethlite.c
+++ b/hw/net/xilinx_ethlite.c
@@ -226,22 +226,25 @@ static NetClientInfo net_xilinx_ethlite_info = {
.cleanup = eth_cleanup,
};
-static int xilinx_ethlite_init(SysBusDevice *sbd)
+static void xilinx_ethlite_realize(DeviceState *dev, Error **errp)
{
- DeviceState *dev = DEVICE(sbd);
struct xlx_ethlite *s = XILINX_ETHLITE(dev);
- sysbus_init_irq(sbd, &s->irq);
-
- memory_region_init_io(&s->mmio, OBJECT(s), ð_ops, s,
- "xlnx.xps-ethernetlite", R_MAX * 4);
- sysbus_init_mmio(sbd, &s->mmio);
-
qemu_macaddr_default_if_unset(&s->conf.macaddr);
s->nic = qemu_new_nic(&net_xilinx_ethlite_info, &s->conf,
object_get_typename(OBJECT(dev)), dev->id, s);
qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);
- return 0;
+}
+
+static void xilinx_ethlite_init(Object *obj)
+{
+ struct xlx_ethlite *s = XILINX_ETHLITE(obj);
+
+ sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);
+
+ memory_region_init_io(&s->mmio, obj, ð_ops, s,
+ "xlnx.xps-ethernetlite", R_MAX * 4);
+ sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
}
static Property xilinx_ethlite_properties[] = {
@@ -254,9 +257,8 @@ static Property xilinx_ethlite_properties[] = {
static void xilinx_ethlite_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = xilinx_ethlite_init;
+ dc->realize = xilinx_ethlite_realize;
dc->reset = xilinx_ethlite_reset;
dc->props = xilinx_ethlite_properties;
}
@@ -265,6 +267,7 @@ static const TypeInfo xilinx_ethlite_info = {
.name = TYPE_XILINX_ETHLITE,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(struct xlx_ethlite),
+ .instance_init = xilinx_ethlite_init,
.class_init = xilinx_ethlite_class_init,
};
--
1.9.3.1.ga73a6ad
- [Qemu-devel] [PATCH microblaze v1 0/6] Microblaze Device QOM cleanups, Peter Crosthwaite, 2014/05/29
- [Qemu-devel] [PATCH microblaze v1 0/6] Microblaze Device QOM cleanups, Peter Crosthwaite, 2014/05/29
- [Qemu-devel] [PATCH microblaze v1 1/6] timer: xilinx_timer: Convert to realize(), Peter Crosthwaite, 2014/05/29
- [Qemu-devel] [PATCH microblaze v1 2/6] net: xilinx_ethlite: Don't reset from init, Peter Crosthwaite, 2014/05/29
- [Qemu-devel] [PATCH microblaze v1 3/6] net: xilinx_ethlite: Convert to realize(),
Peter Crosthwaite <=
- [Qemu-devel] [PATCH microblaze v1 4/6] char: xilinx_uartlite: Don't reset from init, Peter Crosthwaite, 2014/05/29
- [Qemu-devel] [PATCH microblaze v1 5/6] char: xilinx_uartlite: Convert to realize(), Peter Crosthwaite, 2014/05/29
- [Qemu-devel] [PATCH microblaze v1 6/6] intc: xilinx_uartlite: Convert SBD::init -> instance_init, Peter Crosthwaite, 2014/05/29
- [Qemu-devel] [PATCH microblaze v1 1/6] timer: xilinx_timer: Convert to realize(), Peter Crosthwaite, 2014/05/29
- [Qemu-devel] [PATCH microblaze v1 2/6] net: xilinx_ethlite: Don't reset from init, Peter Crosthwaite, 2014/05/29