diff mbox

[net,v1,1/1] net: cadence_gem: Convert to realize()

Message ID 2c4e88786e53d6e1d2a474d2bc07f2630ccdafc9.1403153507.git.peter.crosthwaite@xilinx.com
State New
Headers show

Commit Message

Peter Crosthwaite June 19, 2014, 4:54 a.m. UTC 
SysBusDevice::init is deprecated. Convert to Object::init and
Device::realize as prescribed by QOM conventions.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
---

 hw/net/cadence_gem.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Comments

Stefan Hajnoczi June 20, 2014, 9:12 a.m. UTC | #1 
On Wed, Jun 18, 2014 at 09:54:17PM -0700, Peter Crosthwaite wrote:
> SysBusDevice::init is deprecated. Convert to Object::init and
> Device::realize as prescribed by QOM conventions.
> 
> Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> ---
> 
>  hw/net/cadence_gem.c | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)

Looks fine.  Waiting for Andreas' review before merging.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
diff mbox

Patch

diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index de26609..dff6f21 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -1232,24 +1232,24 @@  static NetClientInfo net_gem_info = {
     .link_status_changed = gem_set_link,
 };
 
-static int gem_init(SysBusDevice *sbd)
+static void gem_realize(DeviceState *dev, Error **errp)
 {
-    DeviceState *dev = DEVICE(sbd);
     GemState *s = GEM(dev);
 
-    DB_PRINT("\n");
-
-    gem_init_register_masks(s);
-    memory_region_init_io(&s->iomem, OBJECT(s), &gem_ops, s,
-                          "enet", sizeof(s->regs));
-    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->id, s);
+}
 
-    return 0;
+static void gem_init(Object *obj)
+{
+    GemState *s = GEM(obj);
+
+    gem_init_register_masks(s);
+    memory_region_init_io(&s->iomem, obj, &gem_ops, s, "enet", sizeof(s->regs));
+    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem);
+    sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);
 }
 
 static const VMStateDescription vmstate_cadence_gem = {
@@ -1275,9 +1275,8 @@  static Property gem_properties[] = {
 static void gem_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
-    SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
 
-    sdc->init = gem_init;
+    dc->realize = gem_realize;
     dc->props = gem_properties;
     dc->vmsd = &vmstate_cadence_gem;
     dc->reset = gem_reset;
@@ -1287,6 +1286,7 @@  static const TypeInfo gem_info = {
     .name  = TYPE_CADENCE_GEM,
     .parent = TYPE_SYS_BUS_DEVICE,
     .instance_size  = sizeof(GemState),
+    .instance_init  = gem_init,
     .class_init = gem_class_init,
 };