[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/24] vl: drop no_quit variable
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 07/24] vl: drop no_quit variable |
Date: |
Fri, 17 Nov 2017 11:30:29 +0100 |
Not used any more, delete it.
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 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
- [Qemu-devel] [PATCH 23/24] curses: build as module, (continued)
- [Qemu-devel] [PATCH 23/24] curses: build as module, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 16/24] cocoa: hook up to display registry, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 24/24] build: opengl should not need X11, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 14/24] console: add qemu display registry, add gtk, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 20/24] console: add ui module loading support, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 05/24] gtk: add and use DisplayOptions + DisplayGTK, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 22/24] gtk: build as module, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 15/24] sdl: hook up to display registry, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 06/24] sdl: use DisplayOptions, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 10/24] cocoa: use DisplayOptions, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 07/24] vl: drop no_quit variable,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 12/24] vl: drop display_type variable, Gerd Hoffmann, 2017/11/17
- Re: [Qemu-devel] [PATCH 00/24] RfC: rework display initialization, no-reply, 2017/11/17