From nobody Thu Apr 25 18:02:58 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555082956; cv=none; d=zoho.com; s=zohoarc; b=e00d73ViCs9oZbbdkZL/EeFcgMmyiUknd/XuBN7/S4JVD/oz1tVVMBmiEKFGZzx4WBunVFGfI83J7Gx24XQFOGR1RTxmdNRTVLzoK3DJVuHN+iFM/sYRK/Yu0JC9UznSfIf+AE8Xl6HzlLRmTgRq0aSxXtZGVnGXS4G4FMK26bU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555082956; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=OFkzq86cknkiPYT8QQphsBAkC6qVze8uTaaPy1GaeF8=; b=OhUtqQ1zNxL4dNKe6tCOunX9C8im9nyW3Jev4bfKcodjAnDZ/eihbDcM6abB+c3QDah5U8nlJ/rHbkOxWCnJnb7UpNGjBFEd6oVsSOJ5J76bqBLX6BQThNIVqki3+iEjBrD7qMNx03DQSmZS4kDzxM/tcsop53cmTggaL+9gfd8= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555082956241259.2517648017546; Fri, 12 Apr 2019 08:29:16 -0700 (PDT) Received: from localhost ([127.0.0.1]:38685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEy71-0004ug-7V for importer@patchew.org; Fri, 12 Apr 2019 11:29:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEy5P-000407-4k for qemu-devel@nongnu.org; Fri, 12 Apr 2019 11:27:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEy5O-00052A-7E for qemu-devel@nongnu.org; Fri, 12 Apr 2019 11:27:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51850) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEy5N-00051F-WD for qemu-devel@nongnu.org; Fri, 12 Apr 2019 11:27:26 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0775E5946F for ; Fri, 12 Apr 2019 15:27:24 +0000 (UTC) Received: from localhost (ovpn-112-59.ams2.redhat.com [10.36.112.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D2136013A; Fri, 12 Apr 2019 15:27:21 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Fri, 12 Apr 2019 17:27:12 +0200 Message-Id: <20190412152713.16018-2-marcandre.lureau@redhat.com> In-Reply-To: <20190412152713.16018-1-marcandre.lureau@redhat.com> References: <20190412152713.16018-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 12 Apr 2019 15:27:24 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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 1/2] vl: constify VGAInterfaceInfo 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: Paolo Bonzini , armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- vl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index c696ad2a13..0a96232e95 100644 --- a/vl.c +++ b/vl.c @@ -2026,7 +2026,7 @@ typedef struct VGAInterfaceInfo { const char *class_names[2]; } VGAInterfaceInfo; =20 -static VGAInterfaceInfo vga_interfaces[VGA_TYPE_MAX] =3D { +static const VGAInterfaceInfo vga_interfaces[VGA_TYPE_MAX] =3D { [VGA_NONE] =3D { .opt_name =3D "none", }, @@ -2072,7 +2072,7 @@ static VGAInterfaceInfo vga_interfaces[VGA_TYPE_MAX] = =3D { =20 static bool vga_interface_available(VGAInterfaceType t) { - VGAInterfaceInfo *ti =3D &vga_interfaces[t]; + const VGAInterfaceInfo *ti =3D &vga_interfaces[t]; =20 assert(t < VGA_TYPE_MAX); return !ti->class_names[0] || @@ -2087,7 +2087,7 @@ static void select_vgahw(const char *p) =20 assert(vga_interface_type =3D=3D VGA_NONE); for (t =3D 0; t < VGA_TYPE_MAX; t++) { - VGAInterfaceInfo *ti =3D &vga_interfaces[t]; + const VGAInterfaceInfo *ti =3D &vga_interfaces[t]; if (ti->opt_name && strstart(p, ti->opt_name, &opts)) { if (!vga_interface_available(t)) { error_report("%s not available", ti->name); --=20 2.21.0.313.ge35b8cb8e2 From nobody Thu Apr 25 18:02:58 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555083062; cv=none; d=zoho.com; s=zohoarc; b=f7uP2/Ye/p2gN2drqXKlt+uXHU6svZxiS8+KhBcSTyFLuBzr1ifK/WmgmAgsUKIzjNOSrV5pahPndLGSMzDRecdSrF9i65t3DJADK+bGMqtnN5Klo6BaoNB7Nlo2ptElb+XY8kt6IK5g6SqUN+i3IkteijGZ3uFZW6Fqyb9Q14o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555083062; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=UxCbJu6wLEt7SX4ToPq2n/fJg+r+zq+0Cxodh+9OFtA=; b=RwDB6njr677ELYRaeUcrd8lzHDrtcsFzAdGNFefk/iaWFZQNQxYeCfwO0Z/gL5C5FD5x0IkLlHEmcnSHMkEtWe/FQTjAIdXYqnDx055d7RgYj87Zv9DK/zwoWYyhJ5EFMibNRp2VlpPVV3SA/mx0dkvM+y3iEyviUSxLSOxu0ck= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555083062202109.55695977426069; Fri, 12 Apr 2019 08:31:02 -0700 (PDT) Received: from localhost ([127.0.0.1]:38736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEy8p-0006cU-93 for importer@patchew.org; Fri, 12 Apr 2019 11:30:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEy5U-00044q-Ko for qemu-devel@nongnu.org; Fri, 12 Apr 2019 11:27:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEy5T-00054q-KL for qemu-devel@nongnu.org; Fri, 12 Apr 2019 11:27:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39086) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEy5T-00054J-Ca for qemu-devel@nongnu.org; Fri, 12 Apr 2019 11:27:31 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B3FE737E85 for ; Fri, 12 Apr 2019 15:27:30 +0000 (UTC) Received: from localhost (ovpn-112-59.ams2.redhat.com [10.36.112.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4A4719750; Fri, 12 Apr 2019 15:27:25 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Fri, 12 Apr 2019 17:27:13 +0200 Message-Id: <20190412152713.16018-3-marcandre.lureau@redhat.com> In-Reply-To: <20190412152713.16018-1-marcandre.lureau@redhat.com> References: <20190412152713.16018-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 12 Apr 2019 15:27:30 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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 2/2] vl: add -vga help support 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: Paolo Bonzini , armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Provide help output similar to other argument help handling: $ qemu-system-x86_64 -vga help none std standard VGA (default) cirrus Cirrus VGA vmware VMWare SVGA xenfb qxl QXL VGA virtio Virtio VG Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- vl.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/vl.c b/vl.c index 0a96232e95..840c45c00f 100644 --- a/vl.c +++ b/vl.c @@ -2080,11 +2080,39 @@ static bool vga_interface_available(VGAInterfaceTyp= e t) object_class_by_name(ti->class_names[1]); } =20 -static void select_vgahw(const char *p) +static const char * +get_default_vga_model(const MachineClass *machine_class) +{ + if (machine_class->default_display) { + return machine_class->default_display; + } else if (vga_interface_available(VGA_CIRRUS)) { + return "cirrus"; + } else if (vga_interface_available(VGA_STD)) { + return "std"; + } + + return NULL; +} + +static void select_vgahw(const MachineClass *machine_class, const char *p) { const char *opts; int t; =20 + if (g_str_equal(p, "help")) { + const char *def =3D get_default_vga_model(machine_class); + + for (t =3D 0; t < VGA_TYPE_MAX; t++) { + const VGAInterfaceInfo *ti =3D &vga_interfaces[t]; + + if (vga_interface_available(t) && ti->opt_name) { + printf("%-20s %s%s\n", ti->opt_name, ti->name ?: "", + g_str_equal(ti->opt_name, def) ? " (default)" : ""); + } + } + exit(0); + } + assert(vga_interface_type =3D=3D VGA_NONE); for (t =3D 0; t < VGA_TYPE_MAX; t++) { const VGAInterfaceInfo *ti =3D &vga_interfaces[t]; @@ -4437,16 +4465,10 @@ int main(int argc, char **argv, char **envp) =20 /* If no default VGA is requested, the default is "none". */ 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"; - } + vga_model =3D get_default_vga_model(machine_class); } if (vga_model) { - select_vgahw(vga_model); + select_vgahw(machine_class, vga_model); } =20 if (watchdog) { --=20 2.21.0.313.ge35b8cb8e2