From mboxrd@z Thu Jan 1 00:00:00 1970 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) From: Gerd Hoffmann 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> Subject: [Qemu-devel] [PATCH v3 11/12] vl: drop request_opengl variable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Gerd Hoffmann , Paolo Bonzini Switch over the one leftover user to qapi DisplayType. The delete the unused request_opengl variable. Signed-off-by: Gerd Hoffmann --- 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 = NULL; enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB; -int request_opengl = -1; int display_opengl; const char* keyboard_layout = NULL; ram_addr_t ram_size; @@ -2149,10 +2148,8 @@ static LegacyDisplayType select_display(const char *p) opts = nextopt; dpy.has_gl = true; if (strstart(opts, "on", &nextopt)) { - request_opengl = 1; dpy.gl = true; } else if (strstart(opts, "off", &nextopt)) { - request_opengl = 0; dpy.gl = 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 = 1; display_opengl = 1; display = DT_EGL; dpy.type = DISPLAY_TYPE_EGL_HEADLESS; @@ -2214,10 +2210,8 @@ static LegacyDisplayType select_display(const char *p) opts = nextopt; dpy.has_gl = true; if (strstart(opts, "on", &nextopt)) { - request_opengl = 1; dpy.gl = true; } else if (strstart(opts, "off", &nextopt)) { - request_opengl = 0; dpy.gl = false; } else { goto invalid_gtk_args; @@ -4382,7 +4376,7 @@ int main(int argc, char **argv, char **envp) qemu_console_early_init(); - if (request_opengl == 1 && display_opengl == 0) { + if (dpy.has_gl && dpy.gl && display_opengl == 0) { #if defined(CONFIG_OPENGL) error_report("OpenGL is not supported by the display"); #else -- 2.9.3