From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V0q3e-0002Dn-8z for qemu-devel@nongnu.org; Sun, 21 Jul 2013 05:36:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V0q3d-0003u3-6E for qemu-devel@nongnu.org; Sun, 21 Jul 2013 05:36:02 -0400 Received: from cantor2.suse.de ([195.135.220.15]:42596 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V0q3c-0003ts-TL for qemu-devel@nongnu.org; Sun, 21 Jul 2013 05:36:01 -0400 Message-ID: <51EBAB7B.9000209@suse.de> Date: Sun, 21 Jul 2013 11:35:55 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <68709baf5587d9ee6e1a958abbb8beedb83b99ce.1372673778.git.hutao@cn.fujitsu.com> In-Reply-To: <68709baf5587d9ee6e1a958abbb8beedb83b99ce.1372673778.git.hutao@cn.fujitsu.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 17/26] fwcfg: use realize for fwcfg List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Hu Tao Cc: qemu-devel Am 01.07.2013 12:18, schrieb Hu Tao: > Signed-off-by: Hu Tao > --- > hw/nvram/fw_cfg.c | 26 ++++++++++++++++---------- > 1 file changed, 16 insertions(+), 10 deletions(-) >=20 > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c > index c8722c2..656ffcc 100644 > --- a/hw/nvram/fw_cfg.c > +++ b/hw/nvram/fw_cfg.c > @@ -523,31 +523,37 @@ 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); > + FWCfgState *s =3D FW_CFG(obj); > =20 > memory_region_init_io(&s->ctl_iomem, &fw_cfg_ctl_mem_ops, s, > "fwcfg.ctl", FW_CFG_SIZE); > - sysbus_init_mmio(dev, &s->ctl_iomem); > memory_region_init_io(&s->data_iomem, &fw_cfg_data_mem_ops, s, > "fwcfg.data", FW_CFG_DATA_SIZE); > - sysbus_init_mmio(dev, &s->data_iomem); > /* In case ctl and data overlap: */ > memory_region_init_io(&s->comb_iomem, &fw_cfg_comb_mem_ops, s, > "fwcfg", FW_CFG_SIZE); > +} There's no reason not to have sysbus_init_mmio() in instance_init, changed that. Andreas > + > +static void fw_cfg_realize(DeviceState *dev, Error **errp) > +{ > + FWCfgState *s =3D FW_CFG(dev); > + SysBusDevice *b =3D SYS_BUS_DEVICE(dev); > + > + sysbus_init_mmio(b, &s->ctl_iomem); > + sysbus_init_mmio(b, &s->data_iomem); > =20 > if (s->ctl_iobase + 1 =3D=3D s->data_iobase) { > - sysbus_add_io(dev, s->ctl_iobase, &s->comb_iomem); > + sysbus_add_io(b, s->ctl_iobase, &s->comb_iomem); > } else { > if (s->ctl_iobase) { > - sysbus_add_io(dev, s->ctl_iobase, &s->ctl_iomem); > + sysbus_add_io(b, s->ctl_iobase, &s->ctl_iomem); > } > if (s->data_iobase) { > - sysbus_add_io(dev, s->data_iobase, &s->data_iomem); > + sysbus_add_io(b, s->data_iobase, &s->data_iomem); > } > } > - return 0; > } > =20 > static Property fw_cfg_properties[] =3D { > @@ -564,9 +570,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; > @@ -577,6 +582,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 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg