From nobody Sat Nov 8 02:49:26 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550042342381469.78771334961436; Tue, 12 Feb 2019 23:19:02 -0800 (PST) Received: from localhost ([127.0.0.1]:52208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtoot-0003vq-Du for importer@patchew.org; Wed, 13 Feb 2019 02:18:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtods-0003yz-6R for qemu-devel@nongnu.org; Wed, 13 Feb 2019 02:07:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtodq-0000U1-RV for qemu-devel@nongnu.org; Wed, 13 Feb 2019 02:07:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58398) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtodq-0000OZ-IB; Wed, 13 Feb 2019 02:07:34 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5BC4B15553; Wed, 13 Feb 2019 07:07:27 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 103FE5D9C5; Wed, 13 Feb 2019 07:07:22 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Mark Cave-Ayland Date: Wed, 13 Feb 2019 08:07:19 +0100 Message-Id: <1550041639-10232-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 13 Feb 2019 07:07:27 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] hw/sparc64: Explicitly set default_display = "std" 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: yang.zhong@intel.com, pbonzini@redhat.com, qemu-trivial@nongnu.org, philmd@redhat.com, Artyom Tarasenko Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The sun4uv_init() function expects vga_interface_type to be either VGA_STD or VGA_NONE and sets up a stdvga device or no vga card accordingly. However, the code in vl.c prefers the Cirrus VGA card to stdvga if it is available and the user and the machine did not specify anything else. So far this has not been a problem, since the Cirrus VGA was not linked into the sparc64 target. But with the upcoming Kconfig build system, all theoretically possible PCI cards will be enabled by default, so the Cirrus VGA card might become available on the sparc64 target, too. vl.c then picks the wrong card, causing sun4uv_init() to abort. Thus let's make it explicit that we always want stdvga for sparc64 and so set default_display =3D "std" for these machines. Signed-off-by: Thomas Huth Reviewed-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/sparc64/sun4u.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index ff24d9b..399f2d7 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -797,6 +797,7 @@ static void sun4u_class_init(ObjectClass *oc, void *dat= a) mc->default_boot_order =3D "c"; mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-UltraSparc-IIi"); mc->ignore_boot_device_suffixes =3D true; + mc->default_display =3D "std"; fwc->get_dev_path =3D sun4u_fw_dev_path; } =20 @@ -820,6 +821,7 @@ static void sun4v_class_init(ObjectClass *oc, void *dat= a) mc->max_cpus =3D 1; /* XXX for now */ mc->default_boot_order =3D "c"; mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Sun-UltraSparc-T1"); + mc->default_display =3D "std"; } =20 static const TypeInfo sun4v_type =3D { --=20 1.8.3.1