diff mbox

[21/24] hw/p*: pass owner to memory_region_init_io

Message ID 51D21134.1050900@suse.de
State New
Headers show

Commit Message

Andreas Färber July 1, 2013, 11:31 p.m. UTC 
Am 25.06.2013 16:15, schrieb Paolo Bonzini:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Needs an update after ppc-next merge, cf. attached.

Andreas

Comments

Paolo Bonzini July 2, 2013, 6:43 a.m. UTC | #1 
Il 02/07/2013 01:31, Andreas Färber ha scritto:
>> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> Needs an update after ppc-next merge, cf. attached.

Thanks!

Paolo
diff mbox

Patch

diff --cc hw/ppc/mpc8544_guts.c
index 56249b4,6448772..0000000
--- a/hw/ppc/mpc8544_guts.c
+++ b/hw/ppc/mpc8544_guts.c
@@@ -114,14 -108,24 +114,14 @@@ static const MemoryRegionOps mpc8544_gu
      },
  };
  
 -static int mpc8544_guts_initfn(SysBusDevice *dev)
 -{
 -    GutsState *s;
 -
 -    s = FROM_SYSBUS(GutsState, SYS_BUS_DEVICE(dev));
 -
 -    memory_region_init_io(&s->iomem, OBJECT(s), &mpc8544_guts_ops, s,
 -                          "mpc6544.guts", MPC8544_GUTS_MMIO_SIZE);
 -    sysbus_init_mmio(dev, &s->iomem);
 -
 -    return 0;
 -}
 -
 -static void mpc8544_guts_class_init(ObjectClass *klass, void *data)
 +static void mpc8544_guts_initfn(Object *obj)
  {
 -    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 +    SysBusDevice *d = SYS_BUS_DEVICE(obj);
 +    GutsState *s = MPC8544_GUTS(obj);
  
-     memory_region_init_io(&s->iomem, NULL, &mpc8544_guts_ops, s,
 -    k->init = mpc8544_guts_initfn;
++    memory_region_init_io(&s->iomem, obj, &mpc8544_guts_ops, s,
 +                          "mpc8544.guts", MPC8544_GUTS_MMIO_SIZE);
 +    sysbus_init_mmio(d, &s->iomem);
  }
  
  static const TypeInfo mpc8544_guts_info = {