From patchwork Sat Dec 19 23:22:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 41481 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 33AC1B6F19 for ; Sun, 20 Dec 2009 10:24:15 +1100 (EST) Received: from localhost ([127.0.0.1]:59855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NM8ei-0000Vb-M8 for incoming@patchwork.ozlabs.org; Sat, 19 Dec 2009 18:24:12 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NM8dK-0000JI-VT for qemu-devel@nongnu.org; Sat, 19 Dec 2009 18:22:47 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NM8dG-0000HH-FT for qemu-devel@nongnu.org; Sat, 19 Dec 2009 18:22:46 -0500 Received: from [199.232.76.173] (port=36402 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NM8dG-0000HD-1s for qemu-devel@nongnu.org; Sat, 19 Dec 2009 18:22:42 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:50625) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NM8dF-0002Su-Ey for qemu-devel@nongnu.org; Sat, 19 Dec 2009 18:22:41 -0500 Received: from smtp08.web.de (fmsmtp08.dlan.cinetic.de [172.20.5.216]) by fmmailgate03.web.de (Postfix) with ESMTP id 26AA3139CD8C5; Sun, 20 Dec 2009 00:22:38 +0100 (CET) Received: from [84.148.55.237] (helo=localhost.localdomain) by smtp08.web.de with asmtp (WEB.DE 4.110 #314) id 1NM8dB-0003y8-00; Sun, 20 Dec 2009 00:22:37 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 20 Dec 2009 00:22:26 +0100 Message-Id: <1261264946-19626-1-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.6.5.2 MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX18L2Te1F3/uEHaBHjPGmZ8OhDNyGjDnycJ/5hWZ Ze+ndMONU8kg5WeSrQbfeJ/p73pCWgCwMpovWJK5OfnWTNd6Z+ dhGyGgsVz8L4D5srkRcA== X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Subject: [Qemu-devel] [PATCH] ppc64: Change default machine to mac99 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Also change the New World default CPU to 970FX for ppc64, since the G4 is a 32-bit CPU. Signed-off-by: Andreas Färber Cc: Alexander Graf Acked-by: Alexander Graf --- hw/ppc_newworld.c | 7 +++++++ hw/ppc_oldworld.c | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index a09f096..a4c714a 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -119,7 +119,11 @@ static void ppc_core99_init (ram_addr_t ram_size, /* init CPUs */ if (cpu_model == NULL) +#ifdef TARGET_PPC64 + cpu_model = "970fx"; +#else cpu_model = "G4"; +#endif for (i = 0; i < smp_cpus; i++) { env = cpu_init(cpu_model); if (!env) { @@ -385,6 +389,9 @@ static QEMUMachine core99_machine = { .desc = "Mac99 based PowerMAC", .init = ppc_core99_init, .max_cpus = MAX_CPUS, +#ifdef TARGET_PPC64 + .is_default = 1, +#endif }; static void core99_machine_init(void) diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index c90b151..7ccc6a1 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -409,7 +409,9 @@ static QEMUMachine heathrow_machine = { .desc = "Heathrow based PowerMAC", .init = ppc_heathrow_init, .max_cpus = MAX_CPUS, +#ifndef TARGET_PPC64 .is_default = 1, +#endif }; static void heathrow_machine_init(void)