diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2013-06-15 11:51:50 +1000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-07-01 01:11:15 +0200 |
| commit | 159f8286b760deace1008f5f68a46cadba337780 (patch) | |
| tree | 5a6d7f96150e4cc5f8c3154e07113006e6628c03 | |
| parent | 9fea2ae25080ad790d7d904d01a1300a45a634eb (diff) | |
| download | focaccia-qemu-159f8286b760deace1008f5f68a46cadba337780.tar.gz focaccia-qemu-159f8286b760deace1008f5f68a46cadba337780.zip | |
target-ppc: Change default machine for 64-bit
Currently, for qemu-system-ppc64, the default machine type is 'mac99'. The mac99 machine is not being actively maintained, and represents a bizarre hybrid of components that never actually existed as a real system. This patch changes the default machine to 'pseries', which is actively maintained and works well with most modern ppc64 Linux distributions as a guest. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> [agraf: adjust commit message] Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | hw/ppc/mac_newworld.c | 3 | ||||
| -rw-r--r-- | hw/ppc/spapr.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 61c25a4357..d8e4db3b6a 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 218ea23da8..5363c3fe2c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -971,6 +971,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, |