Am 15.02.2013 12:45, schrieb Peter Maydell: > Make musicpal-misc into its own (trivial) qdev device, so we > can get rid of the abuse of sysbus_add_memory(). > > Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> > --- > hw/musicpal.c | 34 +++++++++++++++++++++++++++++----- > 1 file changed, 29 insertions(+), 5 deletions(-) > > diff --git a/hw/musicpal.c b/hw/musicpal.c > index 272cb80..819e420 100644 > --- a/hw/musicpal.c > +++ b/hw/musicpal.c > @@ -1031,6 +1031,21 @@ static const TypeInfo mv88w8618_flashcfg_info = { > > #define MP_BOARD_REVISION 0x31 > > +typedef struct {
Anonymous struct > + SysBusDevice busdev; parent_obj please. :) > + MemoryRegion iomem; > +} MusicPalMiscState; > + > +typedef SysBusDeviceClass MusicPalMiscClass; Please don't. Either define a struct and use it for .class_size or drop the typedef. > + > +#define TYPE_MUSICPAL_MISC "musicpal-misc" > +#define MUSICPAL_MISC(obj) \ > + OBJECT_CHECK(MusicPalMiscState, (obj), TYPE_MUSICPAL_MISC) > +#define MUSICPAL_MISC_CLASS(klass) \ > + OBJECT_CLASS_CHECK(MusicPalMiscClass, (klass), TYPE_MUSICPAL_MISC) > +#define MUSICPAL_MISC_GET_CLASS(obj) \ > + OBJECT_GET_CLASS(MusicPalMiscClass, (obj), TYPE_MUSICPAL_MISC) If we don't have such a class so you can just drop these two. SYS_BUS_DEVICE_[GET_]CLASS() should be used instead when needed. > + > static uint64_t musicpal_misc_read(void *opaque, hwaddr offset, > unsigned size) > { > @@ -1054,15 +1069,23 @@ static const MemoryRegionOps musicpal_misc_ops = { > .endianness = DEVICE_NATIVE_ENDIAN, > }; > > -static void musicpal_misc_init(SysBusDevice *dev) > +static void musicpal_misc_init(Object *obj) > { > - MemoryRegion *iomem = g_new(MemoryRegion, 1); > + SysBusDevice *sd = SYS_BUS_DEVICE(obj); > + MusicPalMiscState *s = MUSICPAL_MISC(obj); > > - memory_region_init_io(iomem, &musicpal_misc_ops, NULL, > + memory_region_init_io(&s->iomem, &musicpal_misc_ops, NULL, > "musicpal-misc", MP_MISC_SIZE); > - sysbus_add_memory(dev, MP_MISC_BASE, iomem); > + sysbus_init_mmio(sd, &s->iomem); > } > > +static const TypeInfo musicpal_misc_info = { > + .name = TYPE_MUSICPAL_MISC, > + .parent = TYPE_SYS_BUS_DEVICE, > + .instance_init = musicpal_misc_init, > + .instance_size = sizeof(MusicPalMiscState), > +}; > + > /* WLAN register offsets */ > #define MP_WLAN_MAGIC1 0x11c > #define MP_WLAN_MAGIC2 0x124 > @@ -1612,7 +1635,7 @@ static void musicpal_init(QEMUMachineInitArgs *args) > > sysbus_create_simple("mv88w8618_wlan", MP_WLAN_BASE, NULL); > > - musicpal_misc_init(SYS_BUS_DEVICE(dev)); > + sysbus_create_simple(TYPE_MUSICPAL_MISC, MP_MISC_BASE, NULL); > > dev = sysbus_create_simple("musicpal_gpio", MP_GPIO_BASE, > pic[MP_GPIO_IRQ]); > i2c_dev = sysbus_create_simple("gpio_i2c", -1, NULL); > @@ -1692,6 +1715,7 @@ static void musicpal_register_types(void) > type_register_static(&musicpal_lcd_info); > type_register_static(&musicpal_gpio_info); > type_register_static(&musicpal_key_info); > + type_register_static(&musicpal_misc_info); > } > > type_init(musicpal_register_types) Otherwise looks very good with instance_init! Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg