From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c3z4V-0000Go-0V for qemu-devel@nongnu.org; Tue, 08 Nov 2016 00:35:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c3z4U-0002Ew-1p for qemu-devel@nongnu.org; Tue, 08 Nov 2016 00:35:47 -0500 Date: Tue, 8 Nov 2016 14:40:19 +1100 From: David Gibson Message-ID: <20161108034019.GM28688@umbus.fritz.box> References: <1477825928-10803-1-git-send-email-david@gibson.dropbear.id.au> <1477825928-10803-2-git-send-email-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Qgof7w7UksPF5inF" Content-Disposition: inline In-Reply-To: <1477825928-10803-2-git-send-email-david@gibson.dropbear.id.au> Subject: Re: [Qemu-devel] [RFC 01/17] ppc: Remove some stub POWER6 models List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: nikunj@linux.vnet.ibm.com, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com Cc: thuth@redhat.com, lvivier@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org --Qgof7w7UksPF5inF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Oct 30, 2016 at 10:11:52PM +1100, David Gibson wrote: > The CPU model table includes stub (commented out) definitions for > CPU_POWERPC_POWER6_5 and CPU_POWERPC_POWER6A. These are not real cpu > models, but represent the POWER6 in some compatiblity modes. If we ever > do implement POWER6 (unlikely), we'll implement its compatibility modes in > a different way (similar to what we do for POWER7 and POWER8). So these > stub definitions can be removed. >=20 > Signed-off-by: David Gibson I think this one is sufficiently non-controversial that I've merged it into ppc-for-2.8. > --- > target-ppc/cpu-models.c | 4 ---- > target-ppc/cpu-models.h | 2 -- > 2 files changed, 6 deletions(-) >=20 > diff --git a/target-ppc/cpu-models.c b/target-ppc/cpu-models.c > index 901cf40..506dee1 100644 > --- a/target-ppc/cpu-models.c > +++ b/target-ppc/cpu-models.c > @@ -1130,10 +1130,6 @@ > #if defined(TODO) > POWERPC_DEF("POWER6", CPU_POWERPC_POWER6, POW= ER6, > "POWER6") > - POWERPC_DEF("POWER6_5", CPU_POWERPC_POWER6_5, POW= ER5, > - "POWER6 running in POWER5 mode") > - POWERPC_DEF("POWER6A", CPU_POWERPC_POWER6A, POW= ER6, > - "POWER6A") > #endif > POWERPC_DEF("POWER7_v2.3", CPU_POWERPC_POWER7_v23, POW= ER7, > "POWER7 v2.3") > diff --git a/target-ppc/cpu-models.h b/target-ppc/cpu-models.h > index 7d9e6a2..aafbbd7 100644 > --- a/target-ppc/cpu-models.h > +++ b/target-ppc/cpu-models.h > @@ -549,8 +549,6 @@ enum { > CPU_POWERPC_POWER5 =3D 0x003A0203, > CPU_POWERPC_POWER5P_v21 =3D 0x003B0201, > CPU_POWERPC_POWER6 =3D 0x003E0000, > - CPU_POWERPC_POWER6_5 =3D 0x0F000001, /* POWER6 in POWER5 m= ode */ > - CPU_POWERPC_POWER6A =3D 0x0F000002, > CPU_POWERPC_POWER_SERVER_MASK =3D 0xFFFF0000, > CPU_POWERPC_POWER7_BASE =3D 0x003F0000, > CPU_POWERPC_POWER7_v23 =3D 0x003F0203, --=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 --Qgof7w7UksPF5inF Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJYIUkjAAoJEGw4ysog2bOSebkP/11hFM71yraX5gy9NaRMBSMj 4Yt4SJXcNInEt67ZTR0lcmqqcJDAsfu1k3caXl0cScg5kWTsQU5WRg+tr323o9cK q4zk/ZAoC5sKP3I9YM94bYNdSV0S+DvlynBC717ByINua+dw4ibKSywEPWeUwcxO Y5HXwR2GJ2JDBtM+4g9eZ9RUkqfiULFlSnWsf/MxDQPJT4m84hmKJ8G+cRY5gFUl Juw0NJZ6ukB0t1P2Xec0jaoTxpkkfZpXTIco7E82COgGtQN5VDyk71AgEAxFcNAt I14guSfeh+ex2zBYHooNxJgzctaUrLUsrPL17GN2INBB07iU68Cdf8Vitid82Deb aj0gmaxv1Fs0wzhGLlkiwXAhJKxLNmHFjArgQqxDoGsT9lJVxmyOuGzTwfVuGp1N VEEEN79TpIwzvQDXQwW2POBpeRR98QtQL8QGbKsWL4aGeyVfo11U5GY1QjJ/S2bQ sahW53zEfRuPYo89EaSJLc9ZpFQiiNF5Uu7GWcEJEaDz8GpkUjj2YrG+GmxKvNK5 LtcJlaBWRQQYcAWAUPhh2STsQhqzeR7mrNY/CPhjvkUOqg6yD+Z1Q6ReuSi+9oYW 9fmz7c7r/VeOrdu8CA6IBWF2Bn8PYeKEGOkViEs/TaJm3HjwgNrbJBxVEewuv4UJ M/xoKfunatiZO5XSXMbF =JLop -----END PGP SIGNATURE----- --Qgof7w7UksPF5inF--