Received: from eggs.gnu.org ([208.118.235.92]:38220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ2z9-0006Ft-Ax for qemu-devel@nongnu.org; Fri, 22 Mar 2013 10:30:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJ2z7-0001cz-Bg for qemu-devel@nongnu.org; Fri, 22 Mar 2013 10:30:23 -0400 From: Alexander Graf Date: Fri, 22 Mar 2013 15:28:35 +0100 Message-Id: <1363962572-11025-2-git-send-email-agraf@suse.de> In-Reply-To: <1363962572-11025-1-git-send-email-agraf@suse.de> References: <1363962572-11025-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 01/58] pseries: Fix breakage in CPU QOM conversion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel qemu-devel Cc: Blue Swirl , "qemu-ppc@nongnu.org list:PowerPC" , =?utf-8?q?Aur=C3=A9lien=20Jarno?= , David Gibson From: 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 global first_cpu pointer (still a CPUArchState) to a CPUState. This patch fixes the breakage. Signed-off-by: David Gibson Signed-off-by: Alexander Graf --- hw/ppc/spapr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f355a9b..d45098d 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -629,7 +629,7 @@ static void ppc_spapr_reset(void) spapr->rtas_size); /* Set up the entry state */ - first_cpu_cpu = CPU(first_cpu); + first_cpu_cpu = ENV_GET_CPU(first_cpu); first_cpu->gpr[3] = spapr->fdt_addr; first_cpu->gpr[5] = 0; first_cpu_cpu->halted = 0; -- 1.6.0.2