Remove deprecated -no-frame option

The -no-frame option has been deprecated with QEMU v2.12. It was only
useful with SDL1.2 - now that we've removed support for SDL1.2, we
can certainly remove the -no-frame option, too.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-id: 1549351769-19620-1-git-send-email-thuth@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Thomas Huth 2019-02-05 08:29:29 +01:00 committed by Gerd Hoffmann
parent 773c4a6228
commit 09bd7ba9f5
4 changed files with 3 additions and 38 deletions

View File

@ -102,7 +102,6 @@ extern const char *keyboard_layout;
extern int win2k_install_hack; extern int win2k_install_hack;
extern int alt_grab; extern int alt_grab;
extern int ctrl_grab; extern int ctrl_grab;
extern int no_frame;
extern int smp_cpus; extern int smp_cpus;
extern unsigned int max_cpus; extern unsigned int max_cpus;
extern int cursor_hide; extern int cursor_hide;

View File

@ -37,12 +37,6 @@ would automatically enable USB support on the machine type.
If using the new syntax, USB support must be explicitly If using the new syntax, USB support must be explicitly
enabled via the ``-machine usb=on'' argument. enabled via the ``-machine usb=on'' argument.
@subsection -no-frame (since 2.12.0)
The @code{--no-frame} argument works with SDL 1.2 only. The other user
interfaces never implemented this in the first place. So this will be
removed together with SDL 1.2 support.
@subsection -virtioconsole (since 3.0.0) @subsection -virtioconsole (since 3.0.0)
Option @option{-virtioconsole} has been replaced by Option @option{-virtioconsole} has been replaced by

View File

@ -1294,17 +1294,6 @@ mode using a curses/ncurses interface. Nothing is displayed in graphical
mode. mode.
ETEXI ETEXI
DEF("no-frame", 0, QEMU_OPTION_no_frame,
"-no-frame open SDL window without a frame and window decorations\n",
QEMU_ARCH_ALL)
STEXI
@item -no-frame
@findex -no-frame
Do not use decorations for SDL windows and start them using the whole
available screen space. This makes the using QEMU in a dedicated desktop
workspace more convenient.
ETEXI
DEF("alt-grab", 0, QEMU_OPTION_alt_grab, DEF("alt-grab", 0, QEMU_OPTION_alt_grab,
"-alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt)\n", "-alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt)\n",
QEMU_ARCH_ALL) QEMU_ARCH_ALL)

23
vl.c
View File

@ -160,7 +160,6 @@ static int rtc_host_datetime_offset = -1; /* valid & used only with
QEMUClockType rtc_clock; QEMUClockType rtc_clock;
int vga_interface_type = VGA_NONE; int vga_interface_type = VGA_NONE;
static DisplayOptions dpy; static DisplayOptions dpy;
int no_frame;
static int num_serial_hds; static int num_serial_hds;
static Chardev **serial_hds; static Chardev **serial_hds;
Chardev *parallel_hds[MAX_PARALLEL_PORTS]; Chardev *parallel_hds[MAX_PARALLEL_PORTS];
@ -2113,18 +2112,7 @@ static void parse_display(const char *p)
while (*opts) { while (*opts) {
const char *nextopt; const char *nextopt;
if (strstart(opts, ",frame=", &nextopt)) { if (strstart(opts, ",alt_grab=", &nextopt)) {
g_printerr("The frame= sdl option is deprecated, and will be\n"
"removed in a future release.\n");
opts = nextopt;
if (strstart(opts, "on", &nextopt)) {
no_frame = 0;
} else if (strstart(opts, "off", &nextopt)) {
no_frame = 1;
} else {
goto invalid_sdl_args;
}
} else if (strstart(opts, ",alt_grab=", &nextopt)) {
opts = nextopt; opts = nextopt;
if (strstart(opts, "on", &nextopt)) { if (strstart(opts, "on", &nextopt)) {
alt_grab = 1; alt_grab = 1;
@ -3596,11 +3584,6 @@ int main(int argc, char **argv, char **envp)
dpy.has_full_screen = true; dpy.has_full_screen = true;
dpy.full_screen = true; dpy.full_screen = true;
break; break;
case QEMU_OPTION_no_frame:
g_printerr("The -no-frame switch is deprecated, and will be\n"
"removed in a future release.\n");
no_frame = 1;
break;
case QEMU_OPTION_alt_grab: case QEMU_OPTION_alt_grab:
alt_grab = 1; alt_grab = 1;
break; break;
@ -4279,8 +4262,8 @@ int main(int argc, char **argv, char **envp)
dpy.type = DISPLAY_TYPE_NONE; dpy.type = DISPLAY_TYPE_NONE;
} }
if ((no_frame || alt_grab || ctrl_grab) && dpy.type != DISPLAY_TYPE_SDL) { if ((alt_grab || ctrl_grab) && dpy.type != DISPLAY_TYPE_SDL) {
error_report("-no-frame, -alt-grab and -ctrl-grab are only valid " error_report("-alt-grab and -ctrl-grab are only valid "
"for SDL, ignoring option"); "for SDL, ignoring option");
} }
if (dpy.has_window_close && if (dpy.has_window_close &&