From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2jW8-0007vW-Dt for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:01:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2jW1-00010K-FY for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:01:16 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33411 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2jW1-0000zz-6V for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:01:09 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 4965AA52D7 for ; Fri, 26 Jul 2013 17:01:08 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 17:00:59 +0200 Message-Id: <1374850864-7331-3-git-send-email-afaerber@suse.de> In-Reply-To: <1374850864-7331-1-git-send-email-afaerber@suse.de> References: <1374850864-7331-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next for-1.6 2/6] pl080: QOM'ify pl080 and pl081 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Let pl081 inherit from pl080 and replace triple SysBus initfn with two instance_inits. Signed-off-by: Andreas F=C3=A4rber --- hw/dma/pl080.c | 51 ++++++++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c index 189a922..35b9015 100644 --- a/hw/dma/pl080.c +++ b/hw/dma/pl080.c @@ -35,8 +35,12 @@ typedef struct { uint32_t conf; } pl080_channel; =20 +#define TYPE_PL080 "pl080" +#define PL080(obj) OBJECT_CHECK(PL080State, (obj), TYPE_PL080) + typedef struct PL080State { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; uint8_t tc_int; uint8_t tc_mask; @@ -355,59 +359,44 @@ static const MemoryRegionOps pl080_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int pl08x_init(SysBusDevice *dev, int nchannels) +static void pl080_init(Object *obj) { - PL080State *s =3D FROM_SYSBUS(PL080State, dev); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + PL080State *s =3D PL080(obj); =20 memory_region_init_io(&s->iomem, OBJECT(s), &pl080_ops, s, "pl080", = 0x1000); - sysbus_init_mmio(dev, &s->iomem); - sysbus_init_irq(dev, &s->irq); - s->nchannels =3D nchannels; - return 0; + sysbus_init_mmio(sbd, &s->iomem); + sysbus_init_irq(sbd, &s->irq); + s->nchannels =3D 8; } =20 -static int pl080_init(SysBusDevice *dev) +static void pl081_init(Object *obj) { - return pl08x_init(dev, 8); -} + PL080State *s =3D PL080(obj); =20 -static int pl081_init(SysBusDevice *dev) -{ - return pl08x_init(dev, 2); + s->nchannels =3D 2; } =20 -static void pl080_class_init(ObjectClass *klass, void *data) +static void pl080_class_init(ObjectClass *oc, void *data) { - DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(oc); =20 - k->init =3D pl080_init; dc->no_user =3D 1; dc->vmsd =3D &vmstate_pl080; } =20 static const TypeInfo pl080_info =3D { - .name =3D "pl080", + .name =3D TYPE_PL080, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PL080State), + .instance_init =3D pl080_init, .class_init =3D pl080_class_init, }; =20 -static void pl081_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); - - k->init =3D pl081_init; - dc->no_user =3D 1; - dc->vmsd =3D &vmstate_pl080; -} - static const TypeInfo pl081_info =3D { .name =3D "pl081", - .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(PL080State), - .class_init =3D pl081_class_init, + .parent =3D TYPE_PL080, + .instance_init =3D pl081_init, }; =20 /* The PL080 and PL081 are the same except for the number of channels --=20 1.8.1.4