From nobody Tue Nov 4 21:44:01 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531122394547247.35084880206944; Mon, 9 Jul 2018 00:46:34 -0700 (PDT) Received: from localhost ([::1]:39714 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcQsK-0006bG-UE for importer@patchew.org; Mon, 09 Jul 2018 03:46:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcQq7-00052x-Ab for qemu-devel@nongnu.org; Mon, 09 Jul 2018 03:44:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fcQq4-0002AG-8H for qemu-devel@nongnu.org; Mon, 09 Jul 2018 03:44:07 -0400 Received: from ozlabs.org ([203.11.71.1]:37659) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fcQq3-00028l-PK; Mon, 09 Jul 2018 03:44:04 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 41PHQR6MKTz9s1R; Mon, 9 Jul 2018 17:43:59 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1531122239; bh=WLn37f4Y//iG9x7hNDMj0rT4/JEybsCeSRIqYj6aO+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b5TAFDWFAQ0Gvr+3CnWxuwuRlZw/mtITgIg8/1zcaTeGCPxVmKzcJtujtGDkZXXE5 vbkW8dbuwm0UunrYbqPKIgTdyFt3hcgALrVD0L5+L4GrkUHwx4qhbs54c9cQBpSsdE heEvVRT/0PEm0DMnkD9kqXour2z5oGc3m61hL+/o= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 9 Jul 2018 17:43:35 +1000 Message-Id: <20180709074350.27086-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180709074350.27086-1-david@gibson.dropbear.id.au> References: <20180709074350.27086-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 01/16] ppc: fix default VGA display for Mac machines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland , qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: 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. Unfortu= nately 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 Signed-off-by: David Gibson --- 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 =3D IF_IDE; mc->max_cpus =3D MAX_CPUS; mc->default_boot_order =3D "cd"; + mc->default_display =3D "std"; mc->kvm_type =3D core99_kvm_type; #ifdef TARGET_PPC64 mc->default_cpu_type =3D 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 =3D "cd"; mc->kvm_type =3D heathrow_kvm_type; mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("750_v3.1"); + mc->default_display =3D "std"; } =20 static const TypeInfo ppc_heathrow_machine_info =3D { --=20 2.17.1