From nobody Wed Feb 11 02:33:39 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517584304406275.54547616042726; Fri, 2 Feb 2018 07:11:44 -0800 (PST) Received: from localhost ([::1]:36106 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehd0B-0007DF-CI for importer@patchew.org; Fri, 02 Feb 2018 10:11:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehcem-0005Vp-R8 for qemu-devel@nongnu.org; Fri, 02 Feb 2018 09:49:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehceh-00060o-Tt for qemu-devel@nongnu.org; Fri, 02 Feb 2018 09:49:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46036) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ehceh-00060A-Og for qemu-devel@nongnu.org; Fri, 02 Feb 2018 09:49:31 -0500 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 4A473796F2 for ; Fri, 2 Feb 2018 11:10:27 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-227.ams2.redhat.com [10.36.116.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id 069B378E98; Fri, 2 Feb 2018 11:10:27 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2B46A4F27B; Fri, 2 Feb 2018 12:10:23 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 2 Feb 2018 12:10:21 +0100 Message-Id: <20180202111022.19269-12-kraxel@redhat.com> In-Reply-To: <20180202111022.19269-1-kraxel@redhat.com> References: <20180202111022.19269-1-kraxel@redhat.com> 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.25]); Fri, 02 Feb 2018 11:10:27 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 11/12] vl: drop request_opengl variable 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 , Markus Armbruster , Gerd Hoffmann 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" Switch over the one leftover user to qapi DisplayType. The delete the unused request_opengl variable. Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Blake --- vl.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/vl.c b/vl.c index 899fcad75e..4ef774e783 100644 --- a/vl.c +++ b/vl.c @@ -135,7 +135,6 @@ static const char *data_dir[16]; static int data_dir_idx; const char *bios_name =3D NULL; enum vga_retrace_method vga_retrace_method =3D VGA_RETRACE_DUMB; -int request_opengl =3D -1; int display_opengl; const char* keyboard_layout =3D NULL; ram_addr_t ram_size; @@ -2149,10 +2148,8 @@ static LegacyDisplayType select_display(const char *= p) opts =3D nextopt; dpy.has_gl =3D true; if (strstart(opts, "on", &nextopt)) { - request_opengl =3D 1; dpy.gl =3D true; } else if (strstart(opts, "off", &nextopt)) { - request_opengl =3D 0; dpy.gl =3D false; } else { goto invalid_sdl_args; @@ -2177,7 +2174,6 @@ static LegacyDisplayType select_display(const char *p) } } else if (strstart(p, "egl-headless", &opts)) { #ifdef CONFIG_OPENGL_DMABUF - request_opengl =3D 1; display_opengl =3D 1; display =3D DT_EGL; dpy.type =3D DISPLAY_TYPE_EGL_HEADLESS; @@ -2214,10 +2210,8 @@ static LegacyDisplayType select_display(const char *= p) opts =3D nextopt; dpy.has_gl =3D true; if (strstart(opts, "on", &nextopt)) { - request_opengl =3D 1; dpy.gl =3D true; } else if (strstart(opts, "off", &nextopt)) { - request_opengl =3D 0; dpy.gl =3D false; } else { goto invalid_gtk_args; @@ -4382,7 +4376,7 @@ int main(int argc, char **argv, char **envp) =20 qemu_console_early_init(); =20 - if (request_opengl =3D=3D 1 && display_opengl =3D=3D 0) { + if (dpy.has_gl && dpy.gl && display_opengl =3D=3D 0) { #if defined(CONFIG_OPENGL) error_report("OpenGL is not supported by the display"); #else --=20 2.9.3