From patchwork Thu Jul 5 06:43:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 939696 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41LpHt3xmQz9s29 for ; Thu, 5 Jul 2018 16:44:42 +1000 (AEST) Received: from localhost ([::1]:50577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fay0N-0006c2-Vm for incoming@patchwork.ozlabs.org; Thu, 05 Jul 2018 02:44:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faxzh-0006Zw-OD for qemu-devel@nongnu.org; Thu, 05 Jul 2018 02:43:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faxzf-0007BI-Hi for qemu-devel@nongnu.org; Thu, 05 Jul 2018 02:43:57 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:51392 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 1faxzf-0007AF-Cz; Thu, 05 Jul 2018 02:43:55 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CFA9572634; Thu, 5 Jul 2018 06:43:54 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00EC8111DD13; Thu, 5 Jul 2018 06:43:50 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id F11AEA0C90; Thu, 5 Jul 2018 08:43:48 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 5 Jul 2018 08:43:47 +0200 Message-Id: <20180705064348.3162-2-kraxel@redhat.com> In-Reply-To: <20180705064348.3162-1-kraxel@redhat.com> References: <20180705064348.3162-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 05 Jul 2018 06:43:54 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 05 Jul 2018 06:43:54 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.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 v2 1/2] vga: set default_display for all machines using cirrus. 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Explicitly set MachineClass->default_display to "cirrus" for all machine types (alpha, mips, old i386 versions) which use cirrus today, so they don't depend on cirrus being the default display device. Signed-off-by: Gerd Hoffmann Reviewed-by: Eduardo Habkost --- hw/alpha/dp264.c | 1 + hw/i386/pc_piix.c | 2 +- hw/mips/mips_malta.c | 1 + hw/mips/mips_r4k.c | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) 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 = 4; mc->is_default = 1; mc->default_cpu_type = ALPHA_CPU_TYPE_NAME("ev67"); + mc->default_display = "cirrus"; } DEFINE_MACHINE("clipper", clipper_machine_init) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index dc09466b3e..bcf866ee34 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -566,7 +566,7 @@ static void pc_i440fx_2_1_machine_options(MachineClass *m) PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_i440fx_2_2_machine_options(m); m->hw_version = "2.1.0"; - m->default_display = NULL; + m->default_display = "cirrus"; SET_MACHINE_COMPAT(m, PC_COMPAT_2_1); pcmc->smbios_uuid_encoded = false; pcmc->enforce_aligned_dimm = false; 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 = IF_IDE; mc->max_cpus = 16; mc->is_default = 1; + mc->default_display = "cirrus"; #ifdef TARGET_MIPS64 mc->default_cpu_type = 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 = "mips r4k platform"; mc->init = mips_r4k_init; mc->block_default_type = IF_IDE; + mc->default_display = "cirrus"; #ifdef TARGET_MIPS64 mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000"); #else From patchwork Thu Jul 5 06:43:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 939698 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41LpHt3y67z9s3C for ; Thu, 5 Jul 2018 16:44:40 +1000 (AEST) Received: from localhost ([::1]:50575 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fay0L-0006aQ-4k for incoming@patchwork.ozlabs.org; Thu, 05 Jul 2018 02:44:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faxzh-0006Zx-OH for qemu-devel@nongnu.org; Thu, 05 Jul 2018 02:43:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faxze-00078t-MO for qemu-devel@nongnu.org; Thu, 05 Jul 2018 02:43:57 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:51378 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 1faxze-000764-HK; Thu, 05 Jul 2018 02:43:54 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 86E567262D; Thu, 5 Jul 2018 06:43:53 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 061162166BA9; Thu, 5 Jul 2018 06:43:50 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 04950A0C91; Thu, 5 Jul 2018 08:43:49 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 5 Jul 2018 08:43:48 +0200 Message-Id: <20180705064348.3162-3-kraxel@redhat.com> In-Reply-To: <20180705064348.3162-1-kraxel@redhat.com> References: <20180705064348.3162-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 05 Jul 2018 06:43:53 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 05 Jul 2018 06:43:53 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.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 v2 2/2] vga: don't pick cirrus by 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Now that all machines which need cirrus explicitly select it qemu doesn't need to consider it as default display any more. Drop it. 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 --- vl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/vl.c b/vl.c index 16b913f9d5..117e4e6879 100644 --- a/vl.c +++ b/vl.c @@ -4475,8 +4475,6 @@ int main(int argc, char **argv, char **envp) if (default_vga) { if (machine_class->default_display) { vga_model = machine_class->default_display; - } else if (vga_interface_available(VGA_CIRRUS)) { - vga_model = "cirrus"; } else if (vga_interface_available(VGA_STD)) { vga_model = "std"; }