From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0u-0003iD-Iw for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0o-0002Vg-Ip for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:48 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53388 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0o-0002VZ-A5 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:42 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id D17EFA531D for ; Mon, 29 Jul 2013 21:21:41 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:48 +0200 Message-Id: <1375125630-24869-72-git-send-email-afaerber@suse.de> In-Reply-To: <1375125630-24869-1-git-send-email-afaerber@suse.de> References: <1375125630-24869-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] [PULL 071/173] pl011: QOM'ify pl011 and pl011_luminary 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 the Luminary variant inherit from the ARM one, overwriting its ID on instance_init. Introduce type constant and use QOM casts. Replace triplicated SysBusDevice initfn with QOM realizefn and instance_init. Signed-off-by: Andreas F=C3=A4rber --- hw/char/pl011.c | 62 +++++++++++++++++++++++++++++----------------------= ------ 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/hw/char/pl011.c b/hw/char/pl011.c index e0f7071..a8ae6f4 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -10,8 +10,12 @@ #include "hw/sysbus.h" #include "sysemu/char.h" =20 +#define TYPE_PL011 "pl011" +#define PL011(obj) OBJECT_CHECK(PL011State, (obj), TYPE_PL011) + typedef struct PL011State { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; uint32_t readbuff; uint32_t flags; @@ -261,64 +265,62 @@ static const VMStateDescription vmstate_pl011 =3D { } }; =20 -static int pl011_init(SysBusDevice *dev, const unsigned char *id) +static void pl011_init(Object *obj) { - PL011State *s =3D FROM_SYSBUS(PL011State, dev); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + PL011State *s =3D PL011(obj); =20 memory_region_init_io(&s->iomem, OBJECT(s), &pl011_ops, s, "pl011", = 0x1000); - sysbus_init_mmio(dev, &s->iomem); - sysbus_init_irq(dev, &s->irq); - s->id =3D id; - s->chr =3D qemu_char_get_next_serial(); + sysbus_init_mmio(sbd, &s->iomem); + sysbus_init_irq(sbd, &s->irq); =20 s->read_trigger =3D 1; s->ifl =3D 0x12; s->cr =3D 0x300; s->flags =3D 0x90; - if (s->chr) { - qemu_chr_add_handlers(s->chr, pl011_can_receive, pl011_receive, - pl011_event, s); - } - vmstate_register(&dev->qdev, -1, &vmstate_pl011, s); - return 0; -} =20 -static int pl011_arm_init(SysBusDevice *dev) -{ - return pl011_init(dev, pl011_id_arm); + s->id =3D pl011_id_arm; } =20 -static int pl011_luminary_init(SysBusDevice *dev) +static void pl011_realize(DeviceState *dev, Error **errp) { - return pl011_init(dev, pl011_id_luminary); + PL011State *s =3D PL011(dev); + + s->chr =3D qemu_char_get_next_serial(); + + if (s->chr) { + qemu_chr_add_handlers(s->chr, pl011_can_receive, pl011_receive, + pl011_event, s); + } } =20 -static void pl011_arm_class_init(ObjectClass *klass, void *data) +static void pl011_class_init(ObjectClass *oc, void *data) { - SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(oc); =20 - sdc->init =3D pl011_arm_init; + dc->realize =3D pl011_realize; + dc->vmsd =3D &vmstate_pl011; } =20 static const TypeInfo pl011_arm_info =3D { - .name =3D "pl011", + .name =3D TYPE_PL011, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PL011State), - .class_init =3D pl011_arm_class_init, + .instance_init =3D pl011_init, + .class_init =3D pl011_class_init, }; =20 -static void pl011_luminary_class_init(ObjectClass *klass, void *data) +static void pl011_luminary_init(Object *obj) { - SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(klass); + PL011State *s =3D PL011(obj); =20 - sdc->init =3D pl011_luminary_init; + s->id =3D pl011_id_luminary; } =20 static const TypeInfo pl011_luminary_info =3D { .name =3D "pl011_luminary", - .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(PL011State), - .class_init =3D pl011_luminary_class_init, + .parent =3D TYPE_PL011, + .instance_init =3D pl011_luminary_init, }; =20 static void pl011_register_types(void) --=20 1.8.1.4