From patchwork Tue Apr 2 21:45:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 233160 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 8715B2C0164 for ; Wed, 3 Apr 2013 08:58:42 +1100 (EST) Received: from localhost ([::1]:42791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN9E0-0000f3-Nw for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 17:58:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN97b-0000ZU-8l for qemu-devel@nongnu.org; Tue, 02 Apr 2013 17:52:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN97a-0000Rm-Af for qemu-devel@nongnu.org; Tue, 02 Apr 2013 17:52:03 -0400 Received: from mail-ye0-f173.google.com ([209.85.213.173]:52714) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN97a-0000Rg-6T; Tue, 02 Apr 2013 17:52:02 -0400 Received: by mail-ye0-f173.google.com with SMTP id q5so138763yen.32 for ; Tue, 02 Apr 2013 14:52:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:mime-version:content-type :content-transfer-encoding; bh=jP+9hJ8zrlL20pLjzxbh/H1azyHumi8nTNmYX+TC7Q0=; b=jXO30MSzq+OF+/o6A+OXPbFwy0z12Rv9S1JBpj4RyWBzj+cN/L+v/WGpUK258iLvbp TFR0+4sDl1YbLVjDp3/NGyRIVhT7VUGadxJKwfOaKLgXtbX5EeUkhGo5drQjqzKomMos jSzrGmbmMtXBNCXM00hAx4lqAl1cRGUSMqoBZAYPa+ba8PP7jGMQwe6EnMwo6WVa7BGi +mu5sG40br21OTBxoD5zUUHUWEslZjdAwtBJbCySZCwvKgE56cPojDmczOkcsFwFeBae nsErh3dsxd/iiT9kwoMS3lyW+jQzN9ZtJrzCfDfNbuBMHLX26xNLos59ld37STNbrQuh TYCg== X-Received: by 10.236.198.230 with SMTP id v66mr16458442yhn.36.1364939521777; Tue, 02 Apr 2013 14:52:01 -0700 (PDT) Received: from localhost ([32.97.110.51]) by mx.google.com with ESMTPS id u19sm5743603yhh.15.2013.04.02.14.52.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Apr 2013 14:52:01 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2013 16:45:31 -0500 Message-Id: <1364939142-30066-27-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364939142-30066-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1364939142-30066-1-git-send-email-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.213.173 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 26/37] target-ppc: Fix CPU_POWERPC_MPC8547E 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 From: Andreas Färber It was defined to ..._MPC8545E_v21 rather than ..._MPC8547E_v21. Due to both resolving to CPU_POWERPC_e500v2_v21 this did not show. Fixing this nontheless helps with QOM'ifying CPU aliases. Signed-off-by: Andreas Färber Signed-off-by: Alexander Graf (cherry picked from commit 0136d715ad985fccb8fed4bb5081d5bd20bfe88c) Signed-off-by: Michael Roth --- target-ppc/translate_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 63e6fdc..a05bb7b 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7282,7 +7282,7 @@ enum { #define CPU_POWERPC_MPC8545E_v10 CPU_POWERPC_e500v2_v10 #define CPU_POWERPC_MPC8545E_v20 CPU_POWERPC_e500v2_v20 #define CPU_POWERPC_MPC8545E_v21 CPU_POWERPC_e500v2_v21 -#define CPU_POWERPC_MPC8547E CPU_POWERPC_MPC8545E_v21 +#define CPU_POWERPC_MPC8547E CPU_POWERPC_MPC8547E_v21 #define CPU_POWERPC_MPC8547E_v10 CPU_POWERPC_e500v2_v10 #define CPU_POWERPC_MPC8547E_v20 CPU_POWERPC_e500v2_v20 #define CPU_POWERPC_MPC8547E_v21 CPU_POWERPC_e500v2_v21