From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXMIt-0006nK-52 for qemu-devel@nongnu.org; Wed, 10 Aug 2016 01:43:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bXMIs-0001SO-08 for qemu-devel@nongnu.org; Wed, 10 Aug 2016 01:43:47 -0400 Date: Wed, 10 Aug 2016 14:47:10 +1000 From: David Gibson Message-ID: <20160810044710.GA6145@voom.fritz.box> References: <1470741305-20799-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="opJtzjQTFsWo+cga" Content-Disposition: inline In-Reply-To: <1470741305-20799-1-git-send-email-clg@kaod.org> Subject: Re: [Qemu-devel] [PATCH v2] spar: remove extra type variable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?C=E9dric?= Le Goater Cc: qemu-ppc@nongnu.org, Bharata B Rao , qemu-devel@nongnu.org, Thomas Huth --opJtzjQTFsWo+cga Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Aug 09, 2016 at 01:15:05PM +0200, C=E9dric Le Goater wrote: > The sPAPR CPU core typename is already available in the upper > block. Let's use it and move the check upward also. >=20 > Signed-off-by: C=E9dric Le Goater I already merged this as part of Thomas' series. > --- > hw/ppc/spapr.c | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) >=20 > Index: qemu-dgibson-for-2.8.git/hw/ppc/spapr.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- qemu-dgibson-for-2.8.git.orig/hw/ppc/spapr.c > +++ qemu-dgibson-for-2.8.git/hw/ppc/spapr.c > @@ -1772,6 +1772,11 @@ static void ppc_spapr_init(MachineState > if (mc->query_hotpluggable_cpus) { > char *type =3D spapr_get_cpu_core_type(machine->cpu_model); > =20 > + if (!object_class_by_name(type)) { > + error_report("Unable to find sPAPR CPU Core definition"); > + exit(1); > + } > + > spapr->cores =3D g_new0(Object *, spapr_max_cores); > for (i =3D 0; i < spapr_max_cores; i++) { > int core_id =3D i * smp_threads; > @@ -1783,15 +1788,7 @@ static void ppc_spapr_init(MachineState > qemu_register_reset(spapr_drc_reset, drc); > =20 > if (i < spapr_cores) { > - char *type =3D spapr_get_cpu_core_type(machine->cpu_mode= l); > - Object *core; > - > - if (!object_class_by_name(type)) { > - error_report("Unable to find sPAPR CPU Core definiti= on"); > - exit(1); > - } > - > - core =3D object_new(type); > + Object *core =3D object_new(type); > object_property_set_int(core, smp_threads, "nr-threads", > &error_fatal); > object_property_set_int(core, core_id, CPU_CORE_PROP_COR= E_ID, >=20 --=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 --opJtzjQTFsWo+cga Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXqrHOAAoJEGw4ysog2bOSBNQQANeFnNtDNRQpLOPfX/CLuso9 KD7pY91WYLoKxT79mxQ0JEIBRUYfQBafMtEqGJrmGmqm2/yYK2Wiq4Gngc+6Wrey Ovl9LWaguqnENjZBjJkh+7ZgeP5lDa5BtFaKbilru9V3ib47kZD5w/APp9T/EP/O GM3PYUNho54YZH35L5zhm1iIRfBljZDHYAjiw2NkSyU7mz1h4lWEsbyOyTrO4cix bxGJbVzcMeL+TXVpzpKreeXdBvjSFAFk6agwW+I0kYptG0JhPl4qFhmcs68lE1TN t30Hwr57ZgFL3+444xxXdPgbYkE3Tx1f1Z8Rasr8U/KgUP/0uIOJL3+wOKrEqSMI WUMA3H8rljbpzqU4J6u+W+Ebt8VxtdiMQW0Nt8OfVpXetr0RAXhnoYM4xyOaBKpR ZWvvIPEZnl0Ahn4sHdVUwcuKaqL/twt5amactQWkzUfA0DYZb6Zw811cZQurCNex PDbpuzCd1Qr/FvK+zfttHD/JdMYBkV9Bsfw0LO3ZfkKT7+18/RSO7vIKZxjkC2ky OTjGOAL0A4fsN8EXCC+TVh3rg9CgwMHG55j4DQZppxBaaXnotXKsFZPOTFA/V6jO J2gC5eZiMMMHedoVxJ0LVLh2mmV1U96ZLZtgenx7s0MCBHfkYYdykuQdJ9qbzcB3 6SEVwpRjG1sWRLwFPCx9 =pxTC -----END PGP SIGNATURE----- --opJtzjQTFsWo+cga--