Re: [Qemu-devel] [PATCH] target-ppc: Change default machine for 64-bit

[Andreas Färber]

Am 17.05.2013 06:25, schrieb 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,

Please be more specific than making such general claims in a commit
message! As the default machine it certainly compiles, so where are you
seeing bitrot? The DEC bridge cleanup that I once started kind of
depends on the PCI cleanup you recently looked into.

Andreas

> 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 <address@hidden>
> ---
>  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,
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg