From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGYS6-0001Bx-9h for qemu-devel@nongnu.org; Fri, 15 Mar 2013 13:29:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGYS3-0007g8-L8 for qemu-devel@nongnu.org; Fri, 15 Mar 2013 13:29:58 -0400 Message-ID: <51435A8E.608@suse.de> Date: Fri, 15 Mar 2013 18:29:50 +0100 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1363319969-23517-1-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1363319969-23517-1-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] pseries: Fix breakage in CPU QOM conversion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: qemu-ppc@nongnu.org, agraf@suse.de, qemu-devel@nongnu.org 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=C3=A4rber > 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; Oops, Acked-by: Andreas F=C3=A4rber Did you check the commit if there's more instances of that bug? Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC= rnberg