diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2018-02-02 12:10:16 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-02-20 12:12:04 +0100 |
| commit | 78782712a62d56b4bfdd2a3a641eb40e255b5371 (patch) | |
| tree | 0a8b384e89b3244875032040d07df2b03b1a126f | |
| parent | fe91f36aa5bd846cea816cf0a9b7a13dd76559c1 (diff) | |
| download | focaccia-qemu-78782712a62d56b4bfdd2a3a641eb40e255b5371.tar.gz focaccia-qemu-78782712a62d56b4bfdd2a3a641eb40e255b5371.zip | |
vl: drop no_quit variable
Not used any more, delete it. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20180202111022.19269-7-kraxel@redhat.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | vl.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/vl.c b/vl.c index 61b72758a8..f52bc3b879 100644 --- a/vl.c +++ b/vl.c @@ -153,7 +153,6 @@ int vga_interface_type = VGA_NONE; static int full_screen = 0; static DisplayOptions dpy; int no_frame; -int no_quit = 0; Chardev *serial_hds[MAX_SERIAL_PORTS]; Chardev *parallel_hds[MAX_PARALLEL_PORTS]; Chardev *virtcon_hds[MAX_VIRTIO_CONSOLES]; @@ -2138,10 +2137,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; @@ -3668,7 +3665,6 @@ int main(int argc, char **argv, char **envp) ctrl_grab = 1; break; case QEMU_OPTION_no_quit: - no_quit = 1; dpy.has_window_close = true; dpy.window_close = false; break; @@ -4357,7 +4353,8 @@ int main(int argc, char **argv, char **envp) error_report("-no-frame, -alt-grab and -ctrl-grab are only valid " "for SDL, ignoring option"); } - 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"); } |