From nobody Fri Oct 24 22:13:29 2025 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 1519134725600915.6435412547174; Tue, 20 Feb 2018 05:52:05 -0800 (PST) Received: from localhost ([::1]:55645 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eo8Kv-0008Em-QK for importer@patchew.org; Tue, 20 Feb 2018 08:52:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eo8Gj-0005H5-EC for qemu-devel@nongnu.org; Tue, 20 Feb 2018 08:47:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eo8Ge-0006y6-Cu for qemu-devel@nongnu.org; Tue, 20 Feb 2018 08:47:41 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36252 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 1eo8Ge-0006xK-88 for qemu-devel@nongnu.org; Tue, 20 Feb 2018 08:47:36 -0500 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 7279D8182D3E for ; Tue, 20 Feb 2018 13:47:31 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-147.ams2.redhat.com [10.36.116.147]) by smtp.corp.redhat.com (Postfix) with ESMTP id 309CA2156A3F; Tue, 20 Feb 2018 13:47:29 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1DEBA17537; Tue, 20 Feb 2018 14:47:24 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 20 Feb 2018 14:47:21 +0100 Message-Id: <20180220134723.11776-11-kraxel@redhat.com> In-Reply-To: <20180220134723.11776-1-kraxel@redhat.com> References: <20180220134723.11776-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.8]); Tue, 20 Feb 2018 13:47:31 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 20 Feb 2018 13:47:31 +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] [PULL 10/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 , 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 Message-id: 20180202111022.19269-12-kraxel@redhat.com Signed-off-by: Gerd Hoffmann --- vl.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/vl.c b/vl.c index 6271ad0634..11dc98eba2 100644 --- a/vl.c +++ b/vl.c @@ -136,7 +136,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; @@ -2146,10 +2145,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; @@ -2174,7 +2171,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; @@ -2211,10 +2207,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; @@ -4371,7 +4365,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