From nobody Sun May 19 11:37:32 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530558936248423.5235507825454; Mon, 2 Jul 2018 12:15:36 -0700 (PDT) Received: from localhost ([::1]:34986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa4IR-00012z-0F for importer@patchew.org; Mon, 02 Jul 2018 15:15:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50973) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa4Gt-00009C-NB for qemu-devel@nongnu.org; Mon, 02 Jul 2018 15:14:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fa4Gq-0005uw-FI for qemu-devel@nongnu.org; Mon, 02 Jul 2018 15:13:59 -0400 Received: from relay2.mail.vrmd.de ([81.28.224.28]:46872) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fa4Gq-0005t5-7r; Mon, 02 Jul 2018 15:13:56 -0400 Received: from [188.103.17.27] (helo=murray.fritz.box) by relay2.mail.vrmd.de with esmtpa (Exim 4.86_2) (envelope-from ) id 1fa4Gh-000OsG-8s; Mon, 02 Jul 2018 21:13:47 +0200 From: Sebastian Bauer To: mail@sebastianbauer.info Date: Mon, 2 Jul 2018 21:13:45 +0200 Message-Id: <20180702191345.19120-1-mail@sebastianbauer.info> X-Mailer: git-send-email 2.18.0 X-Relay-User: mail@sebastianbauer.info X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 81.28.224.28 Subject: [Qemu-devel] [PATCH v2] ppc: Include vga cirrus card into the compiling process 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: thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, david@gibson.dropbear.id.au 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" Drivers for this card exists on PPC-based AmigaOS guests so it is useful to allow users to emulate the graphics card for PPC machines. As cirrus vga is currently preferred over std(vga) in absence of any user choice, this change also sets the default display of spapr machines to std as otherwise qemu refuses to start these machines. Not specifying an explicit graphics mode is for instance done by 'make check'. Signed-off-by: Sebastian Bauer --- v2 Adds std as default display for spapr machines Notes This change will make all other ppc machines to use cirrusgd as default display because QEMU internally prefers that card. If this is considered as being too risky, setting the default mode for the other machines as it has been done for spapr would bring them back to the previous level. However, this is rarely used in the exiting code base. Alternatively, using the cirrusgd is possibly considered more an exception than the rule these days, so altering the code to prefer stdvga over cirrusgd may be the better solution (this should also render the changes of v2 obsolete). Feedback on how to proceed is welcome. The patch applies to current ppc-for-3.0 minus v1 of the patch. --- default-configs/ppc-softmmu.mak | 1 + hw/ppc/spapr.c | 1 + 2 files changed, 2 insertions(+) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 7e1a3d8135..6f12bf84f0 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -29,6 +29,7 @@ CONFIG_IDE_SII3112=3Dy CONFIG_I2C=3Dy CONFIG_BITBANG_I2C=3Dy CONFIG_M41T80=3Dy +CONFIG_VGA_CIRRUS=3Dy =20 # For Macs CONFIG_MAC=3Dy diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b2baec026f..0c12c404d4 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3962,6 +3962,7 @@ 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 * M_BYTE; + 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; --=20 2.18.0