From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33527) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmKV-0007NQ-Im for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcmKT-0000Hn-Cz for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:43 -0500 Received: from cantor2.suse.de ([195.135.220.15]:46225 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmKT-0000Ge-2y for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:41 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 26 Nov 2012 01:12:26 +0100 Message-Id: <1353888766-6951-15-git-send-email-afaerber@suse.de> In-Reply-To: <1353888766-6951-1-git-send-email-afaerber@suse.de> References: <1353888766-6951-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] [RFC 14/34] m48t59: QOM'ify ISA M48T59 NVRAM 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?= , anthony@codemonkey.ws Introduce type constant and cast macro to obsolete DO_UPCAST() and container_of(). Prepares for ISA realizefn. Signed-off-by: Andreas F=C3=A4rber --- hw/m48t59.c | 37 ++++++++++++++++++++++--------------- 1 Datei ge=C3=A4ndert, 22 Zeilen hinzugef=C3=BCgt(+), 15 Zeilen entfernt= (-) diff --git a/hw/m48t59.c b/hw/m48t59.c index 7da7e7c..6d2f9cf 100644 --- a/hw/m48t59.c +++ b/hw/m48t59.c @@ -72,8 +72,13 @@ struct M48t59State { uint8_t lock; }; =20 +#define TYPE_ISA_M48T59 "m48t59_isa" +#define M48T59_ISA(obj) \ + OBJECT_CHECK(M48t59ISAState, (obj), TYPE_ISA_M48T59) + typedef struct M48t59ISAState { - ISADevice busdev; + ISADevice parent_obj; + M48t59State state; MemoryRegion io; } M48t59ISAState; @@ -608,7 +613,7 @@ static void m48t59_reset_common(M48t59State *NVRAM) =20 static void m48t59_reset_isa(DeviceState *d) { - M48t59ISAState *isa =3D container_of(d, M48t59ISAState, busdev.qdev)= ; + M48t59ISAState *isa =3D M48T59_ISA(d); M48t59State *NVRAM =3D &isa->state; =20 m48t59_reset_common(NVRAM); @@ -665,20 +670,22 @@ M48t59State *m48t59_init_isa(ISABus *bus, uint32_t = io_base, uint16_t size, int model) { M48t59ISAState *d; - ISADevice *dev; + ISADevice *isadev; + DeviceState *dev; M48t59State *s; =20 - dev =3D isa_create(bus, "m48t59_isa"); - qdev_prop_set_uint32(&dev->qdev, "model", model); - qdev_prop_set_uint32(&dev->qdev, "size", size); - qdev_prop_set_uint32(&dev->qdev, "io_base", io_base); - qdev_init_nofail(&dev->qdev); - d =3D DO_UPCAST(M48t59ISAState, busdev, dev); + isadev =3D isa_create(bus, TYPE_ISA_M48T59); + dev =3D DEVICE(isadev); + qdev_prop_set_uint32(dev, "model", model); + qdev_prop_set_uint32(dev, "size", size); + qdev_prop_set_uint32(dev, "io_base", io_base); + qdev_init_nofail(dev); + d =3D M48T59_ISA(isadev); s =3D &d->state; =20 memory_region_init_io(&d->io, &m48t59_io_ops, s, "m48t59", 4); if (io_base !=3D 0) { - isa_register_ioport(dev, &d->io, io_base); + isa_register_ioport(isadev, &d->io, io_base); } =20 return s; @@ -698,7 +705,7 @@ static void m48t59_init_common(M48t59State *s) =20 static int m48t59_init_isa1(ISADevice *dev) { - M48t59ISAState *d =3D DO_UPCAST(M48t59ISAState, busdev, dev); + M48t59ISAState *d =3D M48T59_ISA(dev); M48t59State *s =3D &d->state; =20 isa_init_irq(dev, &s->IRQ, 8); @@ -728,7 +735,7 @@ static Property m48t59_isa_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 -static void m48t59_init_class_isa1(ObjectClass *klass, void *data) +static void m48t59_isa_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); ISADeviceClass *ic =3D ISA_DEVICE_CLASS(klass); @@ -738,11 +745,11 @@ static void m48t59_init_class_isa1(ObjectClass *kla= ss, void *data) dc->props =3D m48t59_isa_properties; } =20 -static TypeInfo m48t59_isa_info =3D { - .name =3D "m48t59_isa", +static const TypeInfo m48t59_isa_info =3D { + .name =3D TYPE_ISA_M48T59, .parent =3D TYPE_ISA_DEVICE, .instance_size =3D sizeof(M48t59ISAState), - .class_init =3D m48t59_init_class_isa1, + .class_init =3D m48t59_isa_class_init, }; =20 static Property m48t59_properties[] =3D { --=20 1.7.10.4