From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFdvF-0000op-AD for qemu-devel@nongnu.org; Fri, 17 Nov 2017 05:30:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eFdvE-0007Pp-13 for qemu-devel@nongnu.org; Fri, 17 Nov 2017 05:30:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53924) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eFdvD-0007OO-Ph for qemu-devel@nongnu.org; Fri, 17 Nov 2017 05:30:55 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DDAC6D9659 for ; Fri, 17 Nov 2017 10:30:54 +0000 (UTC) From: Gerd Hoffmann Date: Fri, 17 Nov 2017 11:30:29 +0100 Message-Id: <20171117103046.15943-8-kraxel@redhat.com> In-Reply-To: <20171117103046.15943-1-kraxel@redhat.com> References: <20171117103046.15943-1-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 07/24] vl: drop no_quit 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 Not used any more, delete it. Signed-off-by: Gerd Hoffmann --- vl.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vl.c b/vl.c index b34fbf1a09..d461800f13 100644 --- a/vl.c +++ b/vl.c @@ -152,7 +152,6 @@ QEMUClockType rtc_clock; int vga_interface_type = VGA_NONE; static int full_screen = 0; static DisplayOptions dpy; -int no_quit = 0; Chardev *serial_hds[MAX_SERIAL_PORTS]; Chardev *parallel_hds[MAX_PARALLEL_PORTS]; Chardev *virtcon_hds[MAX_VIRTIO_CONSOLES]; @@ -2174,10 +2173,8 @@ static LegacyDisplayType select_display(const char *p) opts = nextopt; dpy.has_window_close = true; if (strstart(opts, "on", &nextopt)) { - no_quit = 0; dpy.window_close = true; } else if (strstart(opts, "off", &nextopt)) { - no_quit = 1; dpy.window_close = false; } else { goto invalid_sdl_args; @@ -3788,7 +3785,6 @@ int main(int argc, char **argv, char **envp) warn_report("-ctrl-grab switch is unsupported, ignoring"); break; case QEMU_OPTION_no_quit: - no_quit = 1; dpy.has_window_close = true; dpy.window_close = false; break; @@ -4474,7 +4470,8 @@ int main(int argc, char **argv, char **envp) #endif } - if (no_quit && (display_type != DT_GTK && display_type != DT_SDL)) { + if (dpy.has_window_close && + (display_type != DT_GTK && display_type != DT_SDL)) { error_report("-no-quit is only valid for GTK and SDL, " "ignoring option"); } -- 2.9.3