From patchwork Fri Mar 15 03:59:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 227844 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B038A2C00D6 for ; Fri, 15 Mar 2013 15:00:04 +1100 (EST) Received: from localhost ([::1]:58517 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGLoJ-0004UK-0m for incoming@patchwork.ozlabs.org; Fri, 15 Mar 2013 00:00:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33907) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGLo2-0004TC-8L for qemu-devel@nongnu.org; Thu, 14 Mar 2013 23:59:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGLny-0000e4-3w for qemu-devel@nongnu.org; Thu, 14 Mar 2013 23:59:46 -0400 Received: from ozlabs.org ([2402:b800:7003:1:1::1]:49449) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGLnx-0000OL-OQ; Thu, 14 Mar 2013 23:59:42 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4D2682C00D5; Fri, 15 Mar 2013 14:59:32 +1100 (EST) From: David Gibson To: agraf@suse.de Date: Fri, 15 Mar 2013 14:59:29 +1100 Message-Id: <1363319969-23517-1-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2402:b800:7003:1:1::1 Cc: David Gibson , qemu-ppc@nongnu.org, afaerber@suse.de, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] pseries: Fix breakage in CPU QOM conversion X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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. Cc: Andreas Färber Signed-off-by: David Gibson Acked-by: Andreas Färber --- hw/ppc/spapr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); /* 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;