From nobody Sun Feb 8 21:32:38 2026 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530703822507746.2236410519977; Wed, 4 Jul 2018 04:30:22 -0700 (PDT) Received: from localhost ([::1]:46290 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fafz6-0002PH-ND for importer@patchew.org; Wed, 04 Jul 2018 07:30:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58249) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fafyE-0001vj-KC for qemu-devel@nongnu.org; Wed, 04 Jul 2018 07:29:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fafyA-00005O-TA for qemu-devel@nongnu.org; Wed, 04 Jul 2018 07:29:14 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:38640 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fafyA-0008Uq-MP; Wed, 04 Jul 2018 07:29:10 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DE162401DE71; Wed, 4 Jul 2018 11:29:07 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-199.ams2.redhat.com [10.36.116.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60DD07C5E; Wed, 4 Jul 2018 11:29:01 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 44AD51FCC0; Wed, 4 Jul 2018 13:28:59 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 4 Jul 2018 13:28:59 +0200 Message-Id: <20180704112859.20146-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 04 Jul 2018 11:29:08 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 04 Jul 2018 11:29:08 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH] vga: make stdvga the global default 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: Eduardo Habkost , Aleksandar Markovic , "Michael S. Tsirkin" , Sebastian Bauer , Alexander Graf , qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , Richard Henderson , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This reverts the stdvga vs. cirrus selection logic. Current state is that "cirrus" is the default and MachineClass->default_display is set to "std" by some machine types to override that. The patch makes "std" the default. Setting default_display to "std" is dropped. Machine types which likely depend on cirrus (alpha, mips, old pc versions) will explicitly set default_display to "cirrus". With this patch applied all ppc machine types will use "std" as default display, no matter whenever cirrus-vga is compiled in or not. Fixes: 29f9cef39e ppc: Include vga cirrus card into the compiling process Signed-off-by: Gerd Hoffmann Reviewed-by: Sebastian Bauer --- hw/alpha/dp264.c | 1 + hw/i386/pc_piix.c | 3 +-- hw/i386/pc_q35.c | 1 - hw/mips/mips_malta.c | 1 + hw/mips/mips_r4k.c | 1 + hw/ppc/spapr.c | 1 - vl.c | 4 ++-- 7 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 80b987f7fb..668e6d099f 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -182,6 +182,7 @@ static void clipper_machine_init(MachineClass *mc) mc->max_cpus =3D 4; mc->is_default =3D 1; mc->default_cpu_type =3D ALPHA_CPU_TYPE_NAME("ev67"); + mc->default_display =3D "cirrus"; } =20 DEFINE_MACHINE("clipper", clipper_machine_init) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index dc09466b3e..30ad22e2e3 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -424,7 +424,6 @@ static void pc_i440fx_machine_options(MachineClass *m) m->family =3D "pc_piix"; m->desc =3D "Standard PC (i440FX + PIIX, 1996)"; m->default_machine_opts =3D "firmware=3Dbios-256k.bin"; - m->default_display =3D "std"; machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); } =20 @@ -566,7 +565,7 @@ static void pc_i440fx_2_1_machine_options(MachineClass = *m) PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); pc_i440fx_2_2_machine_options(m); m->hw_version =3D "2.1.0"; - m->default_display =3D NULL; + m->default_display =3D "cirrus"; SET_MACHINE_COMPAT(m, PC_COMPAT_2_1); pcmc->smbios_uuid_encoded =3D false; pcmc->enforce_aligned_dimm =3D false; diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 532241e3f8..8f2c8c8b8b 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -303,7 +303,6 @@ static void pc_q35_machine_options(MachineClass *m) m->desc =3D "Standard PC (Q35 + ICH9, 2009)"; m->units_per_default_bus =3D 1; m->default_machine_opts =3D "firmware=3Dbios-256k.bin"; - m->default_display =3D "std"; m->no_floppy =3D 1; machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE); machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE); diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 3467451482..998971c53a 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1242,6 +1242,7 @@ static void mips_malta_machine_init(MachineClass *mc) mc->block_default_type =3D IF_IDE; mc->max_cpus =3D 16; mc->is_default =3D 1; + mc->default_display =3D "cirrus"; #ifdef TARGET_MIPS64 mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("20Kc"); #else diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index d5725d0555..c4c7ee8aa5 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -295,6 +295,7 @@ static void mips_machine_init(MachineClass *mc) mc->desc =3D "mips r4k platform"; mc->init =3D mips_r4k_init; mc->block_default_type =3D IF_IDE; + mc->default_display =3D "cirrus"; #ifdef TARGET_MIPS64 mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("R4000"); #else diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 3f5e1d3ec2..0ab90f3aa8 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3962,7 +3962,6 @@ static void spapr_machine_class_init(ObjectClass *oc,= void *data) mc->no_parallel =3D 1; mc->default_boot_order =3D ""; mc->default_ram_size =3D 512 * MiB; - mc->default_display =3D "std"; mc->kvm_type =3D spapr_kvm_type; machine_class_allow_dynamic_sysbus_dev(mc, TYPE_SPAPR_PCI_HOST_BRIDGE); mc->pci_allow_0_address =3D true; diff --git a/vl.c b/vl.c index 16b913f9d5..e60bf2d6cd 100644 --- a/vl.c +++ b/vl.c @@ -4475,10 +4475,10 @@ int main(int argc, char **argv, char **envp) if (default_vga) { if (machine_class->default_display) { vga_model =3D machine_class->default_display; - } else if (vga_interface_available(VGA_CIRRUS)) { - vga_model =3D "cirrus"; } else if (vga_interface_available(VGA_STD)) { vga_model =3D "std"; + } else if (vga_interface_available(VGA_CIRRUS)) { + vga_model =3D "cirrus"; } } if (vga_model) { --=20 2.9.3