From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCTTj-0006zC-R4 for qemu-devel@nongnu.org; Mon, 04 Mar 2013 06:22:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UCTTf-0002Cu-1G for qemu-devel@nongnu.org; Mon, 04 Mar 2013 06:22:47 -0500 Received: from cantor2.suse.de ([195.135.220.15]:39221 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCTTe-0002Cn-O2 for qemu-devel@nongnu.org; Mon, 04 Mar 2013 06:22:42 -0500 Message-ID: <51348400.3010001@suse.de> Date: Mon, 04 Mar 2013 12:22:40 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1361812142-26640-1-git-send-email-peter.maydell@linaro.org> <1361812142-26640-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1361812142-26640-3-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 2/5] musicpal: qdevify musicpal-misc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paolo Bonzini , Michael Walle , Jan Kiszka , qemu-devel@nongnu.org, patches@linaro.org Am 25.02.2013 18:08, schrieb Peter Maydell: > Make musicpal-misc into its own (trivial) qdev device, so we > can get rid of the abuse of sysbus_add_memory(). >=20 > Signed-off-by: Peter Maydell > --- > hw/musicpal.c | 28 +++++++++++++++++++++++----- > 1 file changed, 23 insertions(+), 5 deletions(-) >=20 > diff --git a/hw/musicpal.c b/hw/musicpal.c > index 272cb80..042b7f1 100644 > --- a/hw/musicpal.c > +++ b/hw/musicpal.c > @@ -1031,6 +1031,15 @@ static const TypeInfo mv88w8618_flashcfg_info =3D= { > =20 > #define MP_BOARD_REVISION 0x31 > =20 > +typedef struct { > + SysBusDevice busdev; I believe I asked for this field to be named parent_obj, is there a compatibility reason (macro?) to keep the old-style naming? Otherwise looks good. Andreas > + MemoryRegion iomem; > +} MusicPalMiscState; > + > +#define TYPE_MUSICPAL_MISC "musicpal-misc" > +#define MUSICPAL_MISC(obj) \ > + OBJECT_CHECK(MusicPalMiscState, (obj), TYPE_MUSICPAL_MISC) > + > static uint64_t musicpal_misc_read(void *opaque, hwaddr offset, > unsigned size) > { > @@ -1054,15 +1063,23 @@ static const MemoryRegionOps musicpal_misc_ops = =3D { > .endianness =3D DEVICE_NATIVE_ENDIAN, > }; > =20 > -static void musicpal_misc_init(SysBusDevice *dev) > +static void musicpal_misc_init(Object *obj) > { > - MemoryRegion *iomem =3D g_new(MemoryRegion, 1); > + SysBusDevice *sd =3D SYS_BUS_DEVICE(obj); > + MusicPalMiscState *s =3D MUSICPAL_MISC(obj); > =20 > - 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); > } > =20 > +static const TypeInfo musicpal_misc_info =3D { > + .name =3D TYPE_MUSICPAL_MISC, > + .parent =3D TYPE_SYS_BUS_DEVICE, > + .instance_init =3D musicpal_misc_init, > + .instance_size =3D sizeof(MusicPalMiscState), > +}; > + > /* WLAN register offsets */ > #define MP_WLAN_MAGIC1 0x11c > #define MP_WLAN_MAGIC2 0x124 > @@ -1612,7 +1629,7 @@ static void musicpal_init(QEMUMachineInitArgs *ar= gs) > =20 > sysbus_create_simple("mv88w8618_wlan", MP_WLAN_BASE, NULL); > =20 > - musicpal_misc_init(SYS_BUS_DEVICE(dev)); > + sysbus_create_simple(TYPE_MUSICPAL_MISC, MP_MISC_BASE, NULL); > =20 > dev =3D sysbus_create_simple("musicpal_gpio", MP_GPIO_BASE, pic[MP= _GPIO_IRQ]); > i2c_dev =3D sysbus_create_simple("gpio_i2c", -1, NULL); > @@ -1692,6 +1709,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); > } > =20 > type_init(musicpal_register_types) >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg