From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGnhc-0003st-Eo for qemu-devel@nongnu.org; Sat, 16 Mar 2013 05:47:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGnhX-0004YG-S4 for qemu-devel@nongnu.org; Sat, 16 Mar 2013 05:47:00 -0400 Date: Sat, 16 Mar 2013 20:11:23 +1100 From: David Gibson Message-ID: <20130316091123.GB9402@truffula.fritz.box> References: <1363319969-23517-1-git-send-email-david@gibson.dropbear.id.au> <51435A8E.608@suse.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="St7VIuEGZ6dlpu13" Content-Disposition: inline In-Reply-To: <51435A8E.608@suse.de> Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH] pseries: Fix breakage in CPU QOM conversion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andreas =?iso-8859-1?Q?F=E4rber?= Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org --St7VIuEGZ6dlpu13 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 15, 2013 at 06:29:50PM +0100, Andreas F=E4rber wrote: > Am 15.03.2013 04:59, schrieb David Gibson: > > Commit 259186a7d2f7184efc96ae99bc5658e6159f53ad "cpu: Move halted and > > interrupt_request fields to CPUState" broke the pseries machine. That's > > because it uses CPU() instead of ENV_GET_CPU() to convert from the glob= al > > first_cpu pointer (still a CPUArchState) to a CPUState. This patch fix= es > > the breakage. > >=20 > > Cc: Andreas F=E4rber > > Signed-off-by: David Gibson > > --- > > hw/ppc/spapr.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > >=20 > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > > index 0c51d04..b776d34 100644 > > --- a/hw/ppc/spapr.c > > +++ b/hw/ppc/spapr.c > > @@ -645,7 +645,7 @@ static void ppc_spapr_reset(void) > > spapr->rtas_size); > > =20 > > /* Set up the entry state */ > > - first_cpu_cpu =3D CPU(first_cpu); > > + first_cpu_cpu =3D ENV_GET_CPU(first_cpu); > > first_cpu->gpr[3] =3D spapr->fdt_addr; > > first_cpu->gpr[5] =3D 0; > > first_cpu_cpu->halted =3D 0; >=20 > Oops, >=20 > Acked-by: Andreas F=E4rber >=20 > Did you check the commit if there's more instances of that bug? I did not; sorry. --=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 --St7VIuEGZ6dlpu13 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlFENzsACgkQaILKxv3ab8Ya9gCfa39qYuUOrBNqktVPRtwmwRu6 Dd0AniOkU9G56ObfjUzCmLJKsnc0ghKK =za3e -----END PGP SIGNATURE----- --St7VIuEGZ6dlpu13--