From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 20 Dec 2009 00:22:26 +0100 Message-Id: <1261264946-19626-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: andreas.faerber@web.de Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] ppc64: Change default machine to mac99 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Also change the New World default CPU to 970FX for ppc64, since the G4 is a 32-bit CPU. Signed-off-by: Andreas F=C3=A4rber Cc: 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, =20 /* init CPUs */ if (cpu_model =3D=3D NULL) +#ifdef TARGET_PPC64 + cpu_model =3D "970fx"; +#else cpu_model =3D "G4"; +#endif for (i =3D 0; i < smp_cpus; i++) { env =3D cpu_init(cpu_model); if (!env) { @@ -385,6 +389,9 @@ static QEMUMachine core99_machine =3D { .desc =3D "Mac99 based PowerMAC", .init =3D ppc_core99_init, .max_cpus =3D MAX_CPUS, +#ifdef TARGET_PPC64 + .is_default =3D 1, +#endif }; =20 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 =3D { .desc =3D "Heathrow based PowerMAC", .init =3D ppc_heathrow_init, .max_cpus =3D MAX_CPUS, +#ifndef TARGET_PPC64 .is_default =3D 1, +#endif }; =20 static void heathrow_machine_init(void) --=20 1.6.5.2