From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Pp0-0003V6-5S for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:47:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1Pos-00047J-KL for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:47:18 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45862 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Pos-00046X-6Z for qemu-devel@nongnu.org; Mon, 22 Jul 2013 19:47:10 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 23 Jul 2013 01:46:28 +0200 Message-Id: <1374536796-13983-48-git-send-email-afaerber@suse.de> In-Reply-To: <1374536796-13983-1-git-send-email-afaerber@suse.de> References: <1374536796-13983-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 47/55] fw_cfg: Use QOM realize for fw_cfg List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Hu Tao , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Hu Tao Signed-off-by: Hu Tao [AF: Moved sysbus_init_mmio() to instance_init, renamed variable] Signed-off-by: Andreas F=C3=A4rber --- hw/nvram/fw_cfg.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 8e39111..0a35015 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -526,31 +526,38 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t= data_port, return s; } =20 -static int fw_cfg_init1(SysBusDevice *dev) +static void fw_cfg_initfn(Object *obj) { - FWCfgState *s =3D FW_CFG(dev); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + FWCfgState *s =3D FW_CFG(obj); =20 memory_region_init_io(&s->ctl_iomem, OBJECT(s), &fw_cfg_ctl_mem_ops,= s, "fwcfg.ctl", FW_CFG_SIZE); - sysbus_init_mmio(dev, &s->ctl_iomem); + sysbus_init_mmio(sbd, &s->ctl_iomem); memory_region_init_io(&s->data_iomem, OBJECT(s), &fw_cfg_data_mem_op= s, s, "fwcfg.data", FW_CFG_DATA_SIZE); - sysbus_init_mmio(dev, &s->data_iomem); + sysbus_init_mmio(sbd, &s->data_iomem); /* In case ctl and data overlap: */ memory_region_init_io(&s->comb_iomem, OBJECT(s), &fw_cfg_comb_mem_op= s, s, "fwcfg", FW_CFG_SIZE); +} + +static void fw_cfg_realize(DeviceState *dev, Error **errp) +{ + FWCfgState *s =3D FW_CFG(dev); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); + =20 if (s->ctl_iobase + 1 =3D=3D s->data_iobase) { - sysbus_add_io(dev, s->ctl_iobase, &s->comb_iomem); + sysbus_add_io(sbd, s->ctl_iobase, &s->comb_iomem); } else { if (s->ctl_iobase) { - sysbus_add_io(dev, s->ctl_iobase, &s->ctl_iomem); + sysbus_add_io(sbd, s->ctl_iobase, &s->ctl_iomem); } if (s->data_iobase) { - sysbus_add_io(dev, s->data_iobase, &s->data_iomem); + sysbus_add_io(sbd, s->data_iobase, &s->data_iomem); } } - return 0; } =20 static Property fw_cfg_properties[] =3D { @@ -567,9 +574,8 @@ FWCfgState *fw_cfg_find(void) static void fw_cfg_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D fw_cfg_init1; + dc->realize =3D fw_cfg_realize; dc->no_user =3D 1; dc->reset =3D fw_cfg_reset; dc->vmsd =3D &vmstate_fw_cfg; @@ -580,6 +586,7 @@ static const TypeInfo fw_cfg_info =3D { .name =3D TYPE_FW_CFG, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(FWCfgState), + .instance_init =3D fw_cfg_initfn, .class_init =3D fw_cfg_class_init, }; =20 --=20 1.8.1.4