From patchwork Fri May 17 04:25:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 244493 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 ED88B2C00AC for ; Fri, 17 May 2013 14:25:42 +1000 (EST) Received: from localhost ([::1]:47692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UdCEf-00070M-10 for incoming@patchwork.ozlabs.org; Fri, 17 May 2013 00:25:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UdCEM-00070D-PA for qemu-devel@nongnu.org; Fri, 17 May 2013 00:25:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UdCEI-0007Rh-OA for qemu-devel@nongnu.org; Fri, 17 May 2013 00:25:22 -0400 Received: from ozlabs.org ([2402:b800:7003:1:1::1]:55177) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UdCEI-0007RQ-DQ; Fri, 17 May 2013 00:25:18 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id DC3022C009E; Fri, 17 May 2013 14:25:14 +1000 (EST) From: David Gibson To: aliguori@us.ibm.com Date: Fri, 17 May 2013 14:25:11 +1000 Message-Id: <1368764711-13763-1-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2402:b800:7003:1:1::1 Cc: aik@ozlabs.ru, qemu-devel@nongnu.org, blauwirbel@gmail.com, qemu-ppc@nongnu.org, aurel@aurel32.net, David Gibson Subject: [Qemu-devel] [PATCH] target-ppc: Change default machine for 64-bit 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 Currently, for qemu-system-ppc64, the default machine type is 'mac99'. Since the mac99 machine is not being actively maintained, and shows quite a few signs of bitrot, this is not very sensible. This patch changes the default machine to 'pseries', which is actively maintained and works well with most modern ppc64 Linux distributions as a guest. Because the pseries machine type is optional (it is only built when libfdt is available), this can result in a build with no default machine. In that case vl.c will print a "No machine found" message. This seems reasonable, given that as mentioned, mac99 is unlikely to be a good choice. Signed-off-by: David Gibson --- hw/ppc/mac_newworld.c | 3 --- hw/ppc/spapr.c | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index ce44e95..dafe7d2 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -458,9 +458,6 @@ static QEMUMachine core99_machine = { .desc = "Mac99 based PowerMAC", .init = ppc_core99_init, .max_cpus = MAX_CPUS, -#ifdef TARGET_PPC64 - .is_default = 1, -#endif DEFAULT_MACHINE_OPTIONS, }; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 74a9306..ced1b63 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1348,6 +1348,7 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args) static QEMUMachine spapr_machine = { .name = "pseries", .desc = "pSeries Logical Partition (PAPR compliant)", + .is_default = 1, .init = ppc_spapr_init, .reset = ppc_spapr_reset, .block_default_type = IF_SCSI,