[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/12] vl: drop no_quit variable
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 05/12] vl: drop no_quit variable |
Date: |
Tue, 20 Feb 2018 14:47:16 +0100 |
Not used any more, delete it.
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
vl.c | 7 ++-----
1 file 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");
}
--
2.9.3
- [Qemu-devel] [PULL 00/12] Ui 20180220 patches, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 05/12] vl: drop no_quit variable,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 08/12] cocoa: use DisplayOptions, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 09/12] vl: drop full_screen variable, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 02/12] vl: rename DisplayType to LegacyDisplayType, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 12/12] ui: Reorder vte terminal packing to avoid gtk3 warnings, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 03/12] gtk: add and use DisplayOptions + DisplayGTK, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 07/12] curses: use DisplayOptions, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 11/12] vl: drop display_type variable, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 06/12] egl-headless: use DisplayOptions, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 10/12] vl: drop request_opengl variable, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 01/12] vl: deprecate -no-frame, Gerd Hoffmann, 2018/02/20