Remove deprecated -no-frame option
PATCH 1/1 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 <[email protected]>
--- include/sysemu/sysemu.h | 1 - qemu-deprecated.texi | 6 ------ qemu-options.hx | 11 ----------- vl.c | 23 +++-------------------- 4 files changed, 3 insertions(+), 38 deletions(-)
include/sysemu/sysemu.h +0 -1
@@ -102,7 +102,6 @@ extern const char *keyboard_layout;extern int win2k_install_hack;extern int alt_grab;extern int ctrl_grab; -extern int no_frame;extern int smp_cpus;extern unsigned int max_cpus;extern int cursor_hide;
qemu-deprecated.texi +0 -6
@@ -37,12 +37,6 @@ would automatically enable USB support on the machine type. If using the new syntax, USB support must be explicitly 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) Option @option{-virtioconsole} has been replaced by
qemu-options.hx +0 -11
@@ -1294,17 +1294,6 @@ mode using a curses/ncurses interface. Nothing is displayed in graphical mode. 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, "-alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt)\n", QEMU_ARCH_ALL)
vl.c +3 -20
@@ -160,7 +160,6 @@ static int rtc_host_datetime_offset = -1; /* valid & used only withQEMUClockType rtc_clock;int vga_interface_type =VGA_NONE ;static DisplayOptions dpy; -int no_frame;static int num_serial_hds;static Chardev **serial_hds;Chardev *parallel_hds[MAX_PARALLEL_PORTS ];
@@ -2113,18 +2112,7 @@ static void parse_display(const char *p)while (*opts) {const char *nextopt; -if (strstart (opts,",frame=" , &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)) { +if (strstart (opts,",alt_grab=" , &nextopt)) { opts = nextopt;if (strstart (opts,"on" , &nextopt)) { alt_grab =1 ;
@@ -3596,11 +3584,6 @@ int main(int argc, char **argv, char **envp) dpy.has_full_screen = true; dpy.full_screen = true;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: alt_grab =1 ;break ;
@@ -4279,8 +4262,8 @@ int main(int argc, char **argv, char **envp) dpy.type =DISPLAY_TYPE_NONE ; } -if ((no_frame || alt_grab || ctrl_grab) && dpy.type !=DISPLAY_TYPE_SDL ) { -error_report ("-no-frame, -alt-grab and -ctrl-grab are only valid " +if ((alt_grab || ctrl_grab) && dpy.type !=DISPLAY_TYPE_SDL ) { +error_report ("-alt-grab and -ctrl-grab are only valid " "for SDL, ignoring option" ); } if (dpy.has_window_close &&
Signature · 1 line
1.8.3.1
Quoted 3 lines · Thomas Huth
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.
Was about to do that too. Luckily I checked my mails first ;) Added to UI queue.
thanks,
Gerd