From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDKOy-000633-F7 for qemu-devel@nongnu.org; Mon, 19 Jan 2015 17:02:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDKOs-0000Wz-OR for qemu-devel@nongnu.org; Mon, 19 Jan 2015 17:02:28 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 19 Jan 2015 22:59:29 +0100 Message-Id: <1421704772-10394-2-git-send-email-hpoussin@reactos.org> In-Reply-To: <1421704772-10394-1-git-send-email-hpoussin@reactos.org> References: <1421704772-10394-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 1/4] m48t59: move ISA ports/memory regions registration to QOM constructor List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Mark Cave-Ayland , =?UTF-8?q?Herv=C3=A9=20Poussineau?= -device m48t59_isa can now be used to create a fully functional nvram. Signed-off-by: Herv=C3=A9 Poussineau --- hw/timer/m48t59.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 31509d5..967a313 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -658,10 +658,9 @@ M48t59State *m48t59_init(qemu_irq IRQ, hwaddr mem_ba= se, d =3D SYSBUS_M48T59(dev); state =3D &d->state; sysbus_connect_irq(s, 0, IRQ); - memory_region_init_io(&d->io, OBJECT(d), &m48t59_io_ops, state, - "m48t59", 4); if (io_base !=3D 0) { - memory_region_add_subregion(get_system_io(), io_base, &d->io); + memory_region_add_subregion(get_system_io(), io_base, + sysbus_mmio_get_region(dev, 1)); } if (mem_base !=3D 0) { sysbus_mmio_map(s, 0, mem_base); @@ -687,11 +686,6 @@ M48t59State *m48t59_init_isa(ISABus *bus, uint32_t i= o_base, uint16_t size, d =3D ISA_M48T59(isadev); s =3D &d->state; =20 - memory_region_init_io(&d->io, OBJECT(d), &m48t59_io_ops, s, "m48t59"= , 4); - if (io_base !=3D 0) { - isa_register_ioport(isadev, &d->io, io_base); - } - return s; } =20 @@ -715,19 +709,28 @@ static void m48t59_isa_realize(DeviceState *dev, Er= ror **errp) =20 isa_init_irq(isadev, &s->IRQ, 8); m48t59_realize_common(s, errp); + memory_region_init_io(&d->io, OBJECT(dev), &m48t59_io_ops, s, "m48t5= 9", 4); + if (s->io_base !=3D 0) { + isa_register_ioport(isadev, &d->io, s->io_base); + } + + return 0; } =20 static int m48t59_init1(SysBusDevice *dev) { M48t59SysBusState *d =3D SYSBUS_M48T59(dev); + Object *o =3D OBJECT(dev); M48t59State *s =3D &d->state; Error *err =3D NULL; =20 sysbus_init_irq(dev, &s->IRQ); =20 - memory_region_init_io(&s->iomem, OBJECT(d), &nvram_ops, s, - "m48t59.nvram", s->size); + memory_region_init_io(&s->iomem, o, &nvram_ops, s, "m48t59.nvram", + s->size); + memory_region_init_io(&d->io, o, &m48t59_io_ops, s, "m48t59", 4); sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(dev, &d->io); m48t59_realize_common(s, &err); if (err !=3D NULL) { error_free(err); @@ -751,8 +754,6 @@ static void m48t59_isa_class_init(ObjectClass *klass,= void *data) dc->realize =3D m48t59_isa_realize; dc->reset =3D m48t59_reset_isa; dc->props =3D m48t59_isa_properties; - /* Reason: needs to be wired up by m48t59_init_isa() */ - dc->cannot_instantiate_with_device_add_yet =3D true; } =20 static const TypeInfo m48t59_isa_info =3D { --=20 1.7.10.4