From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QGqvE-0004SB-Ui for qemu-devel@nongnu.org; Mon, 02 May 2011 07:04:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QGqvC-0004oT-Hf for qemu-devel@nongnu.org; Mon, 02 May 2011 07:04:12 -0400 Received: from cantor2.suse.de ([195.135.220.15]:39429 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QGqvC-0004nb-Ag for qemu-devel@nongnu.org; Mon, 02 May 2011 07:04:10 -0400 From: Alexander Graf Date: Mon, 2 May 2011 13:04:03 +0200 Message-Id: <1304334247-6005-2-git-send-email-agraf@suse.de> In-Reply-To: <1304334247-6005-1-git-send-email-agraf@suse.de> References: <1304334247-6005-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 1/5] PPC: Make MPC8544DS obey -cpu switch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel Developers Cc: Scott Wood , "Edgar E. Iglesias" , Liu Yu 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); -- 1.6.0.2