[Qemu-devel] [PATCH] ppc: fix default VGA display for Mac machines

[Qemu-devel] [PATCH] ppc: fix default VGA display for Mac machines

[Mark Cave-Ayland]

Commit 29f9cef39e "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 Mac machines
causing the display to fail to initialise under OpenBIOS.

Update the MachineClass for both Old World and New World Macs so that the
default std(vga) display adapter is the default if no options are specified
which fixes the display for the Mac machines.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/ppc/mac_newworld.c | 1 +
 hw/ppc/mac_oldworld.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index d11980166f..2ca294664b 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -525,6 +525,7 @@ static void core99_machine_class_init(ObjectClass *oc, void *data)
     mc->block_default_type = IF_IDE;
     mc->max_cpus = MAX_CPUS;
     mc->default_boot_order = "cd";
+    mc->default_display = "std";
     mc->kvm_type = core99_kvm_type;
 #ifdef TARGET_PPC64
     mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("970fx_v3.1");
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 06ed6f660e..064d7eb30a 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -383,6 +383,7 @@ static void heathrow_class_init(ObjectClass *oc, void *data)
     mc->default_boot_order = "cd";
     mc->kvm_type = heathrow_kvm_type;
     mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("750_v3.1");
+    mc->default_display = "std";
 }
 
 static const TypeInfo ppc_heathrow_machine_info = {
-- 
2.11.0

Re: [Qemu-devel] [PATCH] ppc: fix default VGA display for Mac machines

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 2028 bytes --]

On Tue, Jul 03, 2018 at 08:10:43PM +0100, Mark Cave-Ayland wrote:
> Commit 29f9cef39e "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 Mac machines
> causing the display to fail to initialise under OpenBIOS.
> 
> Update the MachineClass for both Old World and New World Macs so that the
> default std(vga) display adapter is the default if no options are specified
> which fixes the display for the Mac machines.
> 
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

Applied to ppc-for-3.0, thanks.

> ---
>  hw/ppc/mac_newworld.c | 1 +
>  hw/ppc/mac_oldworld.c | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index d11980166f..2ca294664b 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -525,6 +525,7 @@ static void core99_machine_class_init(ObjectClass *oc, void *data)
>      mc->block_default_type = IF_IDE;
>      mc->max_cpus = MAX_CPUS;
>      mc->default_boot_order = "cd";
> +    mc->default_display = "std";
>      mc->kvm_type = core99_kvm_type;
>  #ifdef TARGET_PPC64
>      mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("970fx_v3.1");
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index 06ed6f660e..064d7eb30a 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -383,6 +383,7 @@ static void heathrow_class_init(ObjectClass *oc, void *data)
>      mc->default_boot_order = "cd";
>      mc->kvm_type = heathrow_kvm_type;
>      mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("750_v3.1");
> +    mc->default_display = "std";
>  }
>  
>  static const TypeInfo ppc_heathrow_machine_info = {

-- 
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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]