diff options
| -rw-r--r-- | docs/about/deprecated.rst | 6 | ||||
| -rw-r--r-- | docs/about/removed-features.rst | 7 | ||||
| -rw-r--r-- | qemu-options.hx | 8 | ||||
| -rw-r--r-- | softmmu/vl.c | 8 |
4 files changed, 8 insertions, 21 deletions
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 5693abb..e21e074 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -134,12 +134,6 @@ specified. Use ``-display sdl,window-close=...`` instead (i.e. with a minus instead of an underscore between "window" and "close"). -``-no-quit`` (since 6.1) -'''''''''''''''''''''''' - -The ``-no-quit`` is a synonym for ``-display ...,window-close=off`` which -should be used instead. - ``-alt-grab`` and ``-display sdl,alt_grab=on`` (since 6.2) '''''''''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index d42c334..4c4da20 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -330,6 +330,13 @@ RISC-V firmware not booted by default (removed in 5.1) QEMU 5.1 changes the default behaviour from ``-bios none`` to ``-bios default`` for the RISC-V ``virt`` machine and ``sifive_u`` machine. +``-no-quit`` (removed in 7.0) +''''''''''''''''''''''''''''' + +The ``-no-quit`` was a synonym for ``-display ...,window-close=off`` which +should be used instead. + + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/qemu-options.hx b/qemu-options.hx index fd1f813..ec90505 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2065,14 +2065,6 @@ SRST ``-display sdl,grab-mod=rctrl`` instead. ERST -DEF("no-quit", 0, QEMU_OPTION_no_quit, - "-no-quit disable SDL/GTK window close capability (deprecated)\n", QEMU_ARCH_ALL) -SRST -``-no-quit`` - Disable window close capability (SDL and GTK only). This option is - deprecated, please use ``-display ...,window-close=off`` instead. -ERST - DEF("sdl", 0, QEMU_OPTION_sdl, "-sdl shorthand for -display sdl\n", QEMU_ARCH_ALL) SRST diff --git a/softmmu/vl.c b/softmmu/vl.c index d9e4c61..a8cad43 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1941,7 +1941,7 @@ static void qemu_create_early_backends(void) "for SDL, ignoring option"); } if (dpy.has_window_close && !use_gtk && !use_sdl) { - error_report("-no-quit is only valid for GTK and SDL, " + error_report("window-close is only valid for GTK and SDL, " "ignoring option"); } @@ -3301,12 +3301,6 @@ void qemu_init(int argc, char **argv, char **envp) warn_report("-ctrl-grab is deprecated, please use " "-display sdl,grab-mod=rctrl instead."); break; - case QEMU_OPTION_no_quit: - dpy.has_window_close = true; - dpy.window_close = false; - warn_report("-no-quit is deprecated, please use " - "-display ...,window-close=off instead."); - break; case QEMU_OPTION_sdl: warn_report("-sdl is deprecated, use -display sdl instead."); #ifdef CONFIG_SDL |