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>
This commit is contained in:
parent
fe91f36aa5
commit
78782712a6
7
vl.c
7
vl.c
|
@ -153,7 +153,6 @@ int vga_interface_type = VGA_NONE;
|
||||||
static int full_screen = 0;
|
static int full_screen = 0;
|
||||||
static DisplayOptions dpy;
|
static DisplayOptions dpy;
|
||||||
int no_frame;
|
int no_frame;
|
||||||
int no_quit = 0;
|
|
||||||
Chardev *serial_hds[MAX_SERIAL_PORTS];
|
Chardev *serial_hds[MAX_SERIAL_PORTS];
|
||||||
Chardev *parallel_hds[MAX_PARALLEL_PORTS];
|
Chardev *parallel_hds[MAX_PARALLEL_PORTS];
|
||||||
Chardev *virtcon_hds[MAX_VIRTIO_CONSOLES];
|
Chardev *virtcon_hds[MAX_VIRTIO_CONSOLES];
|
||||||
|
@ -2138,10 +2137,8 @@ static LegacyDisplayType select_display(const char *p)
|
||||||
opts = nextopt;
|
opts = nextopt;
|
||||||
dpy.has_window_close = true;
|
dpy.has_window_close = true;
|
||||||
if (strstart(opts, "on", &nextopt)) {
|
if (strstart(opts, "on", &nextopt)) {
|
||||||
no_quit = 0;
|
|
||||||
dpy.window_close = true;
|
dpy.window_close = true;
|
||||||
} else if (strstart(opts, "off", &nextopt)) {
|
} else if (strstart(opts, "off", &nextopt)) {
|
||||||
no_quit = 1;
|
|
||||||
dpy.window_close = false;
|
dpy.window_close = false;
|
||||||
} else {
|
} else {
|
||||||
goto invalid_sdl_args;
|
goto invalid_sdl_args;
|
||||||
|
@ -3668,7 +3665,6 @@ int main(int argc, char **argv, char **envp)
|
||||||
ctrl_grab = 1;
|
ctrl_grab = 1;
|
||||||
break;
|
break;
|
||||||
case QEMU_OPTION_no_quit:
|
case QEMU_OPTION_no_quit:
|
||||||
no_quit = 1;
|
|
||||||
dpy.has_window_close = true;
|
dpy.has_window_close = true;
|
||||||
dpy.window_close = false;
|
dpy.window_close = false;
|
||||||
break;
|
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 "
|
error_report("-no-frame, -alt-grab and -ctrl-grab are only valid "
|
||||||
"for SDL, ignoring option");
|
"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, "
|
error_report("-no-quit is only valid for GTK and SDL, "
|
||||||
"ignoring option");
|
"ignoring option");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue