qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] target-ppc: Change default machine for 64-bit
@ 2013-05-17  4:25 David Gibson
  2013-05-17  4:36 ` [Qemu-devel] [Qemu-ppc] " Benjamin Herrenschmidt
  2013-05-17  7:42 ` [Qemu-devel] " Andreas Färber
  0 siblings, 2 replies; 16+ messages in thread
From: David Gibson @ 2013-05-17  4:25 UTC (permalink / raw)
  To: aliguori; +Cc: aik, qemu-devel, blauwirbel, qemu-ppc, aurel, David Gibson

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 <david@gibson.dropbear.id.au>
---
 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,
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2013-06-16 10:39 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-17  4:25 [Qemu-devel] [PATCH] target-ppc: Change default machine for 64-bit David Gibson
2013-05-17  4:36 ` [Qemu-devel] [Qemu-ppc] " Benjamin Herrenschmidt
2013-05-17  5:17   ` David Gibson
2013-05-17  7:17     ` Peter Maydell
2013-05-17  7:22     ` Alexander Graf
2013-05-17  7:42 ` [Qemu-devel] " Andreas Färber
2013-05-17  8:01   ` [Qemu-devel] [Qemu-ppc] " Benjamin Herrenschmidt
2013-06-13 13:49   ` Alexander Graf
2013-06-13 18:31     ` Anthony Liguori
2013-06-13 18:44       ` Scott Wood
2013-06-13 19:02         ` Anthony Liguori
2013-06-13 20:44           ` Peter Maydell
2013-06-14 16:15           ` Andreas Färber
2013-06-14 14:28     ` Andreas Färber
2013-06-14 21:58       ` Benjamin Herrenschmidt
2013-06-16 10:20       ` David Gibson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).