From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36305) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aC3Gi-0001eE-AG for qemu-devel@nongnu.org; Thu, 24 Dec 2015 05:37:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aC3Gg-0003fq-KN for qemu-devel@nongnu.org; Thu, 24 Dec 2015 05:37:12 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:34556) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aC3Gg-0003dG-8Y for qemu-devel@nongnu.org; Thu, 24 Dec 2015 05:37:10 -0500 Date: Thu, 24 Dec 2015 19:25:40 +1100 From: David Gibson Message-ID: <20151224082540.GZ3011@voom.redhat.com> References: <1450870212-32715-1-git-send-email-caoj.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="5OPIRG5sBUHnKBkK" Content-Disposition: inline In-Reply-To: <1450870212-32715-1-git-send-email-caoj.fnst@cn.fujitsu.com> Subject: Re: [Qemu-devel] [PATCH] spapr vio: fix to incomplete QOMify List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cao jin Cc: qemu-devel@nongnu.org, agraf@suse.de --5OPIRG5sBUHnKBkK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Dec 23, 2015 at 07:30:12PM +0800, Cao jin wrote: > Signed-off-by: Cao jin Applied to my ppc-for-2.6 queue, thanks. > --- > hw/ppc/spapr_vio.c | 12 +++++------- > include/hw/ppc/spapr_vio.h | 2 +- > 2 files changed, 6 insertions(+), 8 deletions(-) >=20 > diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c > index c51eb8e..46f3b8d 100644 > --- a/hw/ppc/spapr_vio.c > +++ b/hw/ppc/spapr_vio.c > @@ -388,7 +388,7 @@ static void rtas_quiesce(PowerPCCPU *cpu, sPAPRMachin= eState *spapr, > =20 > static VIOsPAPRDevice *reg_conflict(VIOsPAPRDevice *dev) > { > - VIOsPAPRBus *bus =3D DO_UPCAST(VIOsPAPRBus, bus, dev->qdev.parent_bu= s); > + VIOsPAPRBus *bus =3D SPAPR_VIO_BUS(dev->qdev.parent_bus); > BusChild *kid; > VIOsPAPRDevice *other; > =20 > @@ -449,7 +449,7 @@ static void spapr_vio_busdev_realize(DeviceState *qde= v, Error **errp) > } > } else { > /* Need to assign an address */ > - VIOsPAPRBus *bus =3D DO_UPCAST(VIOsPAPRBus, bus, dev->qdev.paren= t_bus); > + VIOsPAPRBus *bus =3D SPAPR_VIO_BUS(dev->qdev.parent_bus); > =20 > do { > dev->reg =3D bus->next_reg++; > @@ -523,13 +523,12 @@ VIOsPAPRBus *spapr_vio_bus_init(void) > DeviceState *dev; > =20 > /* Create bridge device */ > - dev =3D qdev_create(NULL, "spapr-vio-bridge"); > + dev =3D qdev_create(NULL, TYPE_SPAPR_VIO_BRIDGE); > qdev_init_nofail(dev); > =20 > /* Create bus on bridge device */ > - > qbus =3D qbus_create(TYPE_SPAPR_VIO_BUS, dev, "spapr-vio"); > - bus =3D DO_UPCAST(VIOsPAPRBus, bus, qbus); > + bus =3D SPAPR_VIO_BUS(qbus); > bus->next_reg =3D 0x71000000; > =20 > /* hcall-vio */ > @@ -567,9 +566,8 @@ static void spapr_vio_bridge_class_init(ObjectClass *= klass, void *data) > } > =20 > static const TypeInfo spapr_vio_bridge_info =3D { > - .name =3D "spapr-vio-bridge", > + .name =3D TYPE_SPAPR_VIO_BRIDGE, > .parent =3D TYPE_SYS_BUS_DEVICE, > - .instance_size =3D sizeof(SysBusDevice), > .class_init =3D spapr_vio_bridge_class_init, > }; > =20 > diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h > index 2299a54..c9733e7 100644 > --- a/include/hw/ppc/spapr_vio.h > +++ b/include/hw/ppc/spapr_vio.h > @@ -34,7 +34,7 @@ > #define TYPE_SPAPR_VIO_BUS "spapr-vio-bus" > #define SPAPR_VIO_BUS(obj) OBJECT_CHECK(VIOsPAPRBus, (obj), TYPE_SPAPR_V= IO_BUS) > =20 > -struct VIOsPAPRDevice; > +#define TYPE_SPAPR_VIO_BRIDGE "spapr-vio-bridge" > =20 > typedef struct VIOsPAPR_CRQ { > uint64_t qladdr; --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --5OPIRG5sBUHnKBkK Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWe6wEAAoJEGw4ysog2bOSKXcQANoir/1ykqO+id2a2SvUuyU1 tquiRFjV9zV8NP0orDJpRoeAaLwUqH5NEp6Eru9cCm8lQsk+jCTrWDS6XlxlMEoi jaxv+JU6rHqANqLpA5kseUpfB8u6t4bQtPMx78MGOiBMhz2r+NGTsM8gxI9qixj5 wQQEdlzC8lfmfTGlOq7f3zOG/WU5gipoL2KoCS+OIB9U5C/2uc/KwsTun9OQHzA8 xVGbZI7VkSJYw7F7l86DPwqb8T+DtBvmZjnMtfaCTpGkl9jKOoZFB31agrB/QilX gtMRkGsoUiV0jppiaYRWQKw4YqChx0PQzyvfrHCdXR66cQVX7cP9sbyhmW32yEIQ b/0Gm4yjQWBkQWE5o9RQORWsP7yGvfHSQF9O3hyaV7imK1grm81O5EPX4R74C34N +zA5jrE6al9/dhuv+fHqD00IfZ1kNpjTPC96nzRwgKtqq8wkYLcUYc/ezW9h9YPZ eNdEyjDx9xKX/w51eOJRzz3C4+XkQI+Av3iH85QplUGiHz6Wf4KJrsoWb5dxIN3C X1lDu+PgTsWVcGQLZTzex2TSdcY1VEmnPReJukZb/tVyuj145m06dd6o+rPVS3Fp 6DyZq1finJaQf2XTlxsZeFG9qVfB3ZiFOoLvdjjl3/8twDH+uz/qysVQwHqOvXJl l00FsDvtTCllC8K6MbL3 =cIja -----END PGP SIGNATURE----- --5OPIRG5sBUHnKBkK--