On Fri, Jul 06, 2018 at 08:51:55AM +0100, Mark Cave-Ayland wrote: > Commit 29f9cef "ppc: Include vga cirrus card into the compiling process" > changed the default display adapter for all PPC machines to cirrus. > Unfortunately > it missed setting the default display type to stdvga for both PReP machines > causing the display to fail to initialise under OpenHackWare. > > Update the MachineClass for both prep and 40p machines so that the default > std(vga) display adapter is the default if no options are specified > which fixes the display for the PReP machines. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Applied to ppc-for-3.0.
> ---
> hw/ppc/prep.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
> index 6689407b3d..3401570d98 100644
> --- a/hw/ppc/prep.c
> +++ b/hw/ppc/prep.c
> @@ -682,6 +682,7 @@ static void prep_machine_init(MachineClass *mc)
> mc->max_cpus = MAX_CPUS;
> mc->default_boot_order = "cad";
> mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("602");
> + mc->default_display = "std";
> }
>
> static int prep_set_cmos_checksum(DeviceState *dev, void *opaque)
> @@ -888,6 +889,7 @@ static void ibm_40p_machine_init(MachineClass *mc)
> mc->block_default_type = IF_SCSI;
> mc->default_boot_order = "c";
> mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("604");
> + mc->default_display = "std";
> }
>
> DEFINE_MACHINE("40p", ibm_40p_machine_init)
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
