From patchwork Sat Apr 30 22:54:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 93534 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 95D0AB6F68 for ; Sun, 1 May 2011 08:55:29 +1000 (EST) Received: from localhost ([::1]:57966 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QGJ4P-0000Uv-VD for incoming@patchwork.ozlabs.org; Sat, 30 Apr 2011 18:55:25 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QGJ44-0000RM-5l for qemu-devel@nongnu.org; Sat, 30 Apr 2011 18:55:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QGJ43-0001Zh-IF for qemu-devel@nongnu.org; Sat, 30 Apr 2011 18:55:04 -0400 Received: from cantor.suse.de ([195.135.220.2]:35727 helo=mx1.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QGJ43-0001Z9-Cs for qemu-devel@nongnu.org; Sat, 30 Apr 2011 18:55:03 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 134829417A; Sun, 1 May 2011 00:55:00 +0200 (CEST) From: Alexander Graf To: QEMU-devel Developers Date: Sun, 1 May 2011 00:54:56 +0200 Message-Id: <1304204100-22973-2-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1304204100-22973-1-git-send-email-agraf@suse.de> References: <1304204100-22973-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.2 Cc: Scott Wood , "Edgar E. Iglesias" , Liu Yu Subject: [Qemu-devel] [PATCH 1/5] PPC: Make MPC8544DS obey -cpu switch 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 The MPC8544DS board emulation code ignored the user defined -cpu switch. This patch enables it to only provide a sane default, not force an e500v2 CPU inside. Signed-off-by: Alexander Graf --- hw/ppce500_mpc8544ds.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c index e111dda..1b8a1c4 100644 --- a/hw/ppce500_mpc8544ds.c +++ b/hw/ppce500_mpc8544ds.c @@ -178,7 +178,11 @@ static void mpc8544ds_init(ram_addr_t ram_size, qemu_irq *irqs, *mpic, *pci_irqs; /* Setup CPU */ - env = cpu_ppc_init("e500v2_v30"); + if (cpu_model == NULL) { + cpu_model = "e500v2_v30"; + } + + env = cpu_ppc_init(cpu_model); if (!env) { fprintf(stderr, "Unable to initialize CPU!\n"); exit(1);