From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brEFy-0005mx-IL for qemu-devel@nongnu.org; Mon, 03 Oct 2016 21:10:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brEFw-0001HY-3b for qemu-devel@nongnu.org; Mon, 03 Oct 2016 21:10:53 -0400 Date: Tue, 4 Oct 2016 11:20:09 +1100 From: David Gibson Message-ID: <20161004002009.GA18648@umbus.fritz.box> References: <147549680021.17386.17361379735084290696.stgit@bahia> <20161003151422.GA17192@in.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="d6Gm4EdcadzBjdND" Content-Disposition: inline In-Reply-To: <20161003151422.GA17192@in.ibm.com> Subject: Re: [Qemu-devel] [PATCH] spapr: fix check of cpu alias name in spapr_get_cpu_core_type() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: Greg Kurz , qemu-ppc@nongnu.org, qemu-devel@nongnu.org --d6Gm4EdcadzBjdND Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Oct 03, 2016 at 08:44:22PM +0530, Bharata B Rao wrote: > On Mon, Oct 03, 2016 at 02:13:20PM +0200, Greg Kurz wrote: > > If the user passes an alias name and a property to -cpu, QEMU fails to > > find the CPU definition and exits. > >=20 > > $ qemu-system-ppc64 -cpu POWER8E,compat=3Dpower7 > > qemu-system-ppc64: Unable to find sPAPR CPU Core definition > >=20 > > This happens because spapr_get_cpu_core_type() passes the full string f= rom > > the command line (i.e. "POWER8E,compat=3Dpower7") to ppc_cpu_lookup_ali= as(), > > instead of the alias name piece only (i.e. "POWER8E"). > >=20 > > The fix is to pass model_pieces[0] to ppc_cpu_lookup_alias(). > >=20 > > Signed-off-by: Greg Kurz >=20 > Reviewed-by: Bharata B Rao Applied to ppc-for-2.8, thanks. >=20 > > --- > > hw/ppc/spapr_cpu_core.c | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > >=20 > > diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c > > index 6f0533c34259..35d1873b9ff3 100644 > > --- a/hw/ppc/spapr_cpu_core.c > > +++ b/hw/ppc/spapr_cpu_core.c > > @@ -92,20 +92,20 @@ char *spapr_get_cpu_core_type(const char *model) > > gchar **model_pieces =3D g_strsplit(model, ",", 2); > >=20 > > core_type =3D g_strdup_printf("%s-%s", model_pieces[0], TYPE_SPAPR= _CPU_CORE); > > - g_strfreev(model_pieces); > >=20 > > /* Check whether it exists or whether we have to look up an alias = name */ > > if (!object_class_by_name(core_type)) { > > const char *realmodel; > >=20 > > g_free(core_type); > > - realmodel =3D ppc_cpu_lookup_alias(model); > > + core_type =3D NULL; > > + realmodel =3D ppc_cpu_lookup_alias(model_pieces[0]); > > if (realmodel) { > > - return spapr_get_cpu_core_type(realmodel); > > + core_type =3D spapr_get_cpu_core_type(realmodel); > > } > > - return NULL; > > } > >=20 > > + g_strfreev(model_pieces); > > return core_type; > > } > >=20 >=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 --d6Gm4EdcadzBjdND Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX8vW2AAoJEGw4ysog2bOSkQUQANADNrYpE1CxL/BXAKBPbniW xjT3PNM9ETFwBOaNzXcBy8V84TSPh4QxCCZ809Ww2/TVDKt4DV6DT2QLxBbJE63X Te2g9rBH1galFa+VvQxfA+kOKdiZ7PASar9p6VQ55jieYbv9VTdz2d7va3KIu9ZR PGaAFny9qQZIZECtm6pToAfVY/CFKLkzG03xTFtA9oHS0yG0kAflmswz00nX9jCx NgjaU/uEhM6abqt7HsqGXfWJE0cgzhoL0JcTbhYER8Y1qDYzyDpx4B+fze23hxiA pO4GxJS2uk+3ekZvs1rrwdOYU9piSDvYGU0Gf4ZO+7m7qJemsvxv3JJbGE3QO7rN zGSSnqCY7hhiOq5E6EmNEVbQMmdyNqAUI1yTtswc5DIvigl/kZ4e+I2bCJAmXwXx iTuSw/2nvfre+KfaSkDKtfbXbLH6CjMuIHpFE6kCdI4NJgZV896y06rLzSFgC+gf VEaLG35ZcGXVjT96QNEqimJKA45hY5kKzJZToGns7cvwwMU2ZtO55lPPfnSWxXyE 6G2xuO3qmTkDBiIDigGbcKz3CP298H6HVRxkapN7bY47//xTD2khR57LR1in1jJp g+J8hx1ZLbjZS4QCfddYvhTvUoxzMkcbKXVwaJaoXHiWw3miQAJMvHKNitU2OUBV A0GREToicrY773VZwwY9 =CaBw -----END PGP SIGNATURE----- --d6Gm4EdcadzBjdND--