diff options
| author | Thomas Huth <thuth@redhat.com> | 2021-06-30 18:32:30 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-07-05 19:21:07 +0200 |
| commit | b6ddc6a2b2b8c32dc2db12d5848eadde10e30136 (patch) | |
| tree | f043b95f2c13d77d0a6df8aeec171c40359b0b86 | |
| parent | bb20b86db9acb7a6f653fd40c45d46a9df6b2a75 (diff) | |
| download | qemu-b6ddc6a2b2b8c32dc2db12d5848eadde10e30136.zip qemu-b6ddc6a2b2b8c32dc2db12d5848eadde10e30136.tar.gz qemu-b6ddc6a2b2b8c32dc2db12d5848eadde10e30136.tar.bz2 | |
ui: Mark the '-no-quit' option as deprecated
It's just a wrapper around the -display ...,window-close=off parameter,
and the name "no-quit" is rather confusing compared to "window-close"
(since there are still other means to quit the emulator), so we should
rather tell our users to use the "window-close" parameter instead.
While we're at it, update the documentation to state that
"-no-quit" is available for GTK, too, not only for SDL.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210630163231.467987-4-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | docs/system/deprecated.rst | 6 | ||||
| -rw-r--r-- | qemu-options.hx | 5 | ||||
| -rw-r--r-- | softmmu/vl.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index bb624d3..70e08ba 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -132,6 +132,12 @@ 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. + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/qemu-options.hx b/qemu-options.hx index ae56fa4..c862f1f 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1910,10 +1910,11 @@ SRST ERST DEF("no-quit", 0, QEMU_OPTION_no_quit, - "-no-quit disable SDL window close capability\n", QEMU_ARCH_ALL) + "-no-quit disable SDL/GTK window close capability (deprecated)\n", QEMU_ARCH_ALL) SRST ``-no-quit`` - Disable SDL window close capability. + 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, diff --git a/softmmu/vl.c b/softmmu/vl.c index 36b7616..7dd2d72 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3237,6 +3237,8 @@ void qemu_init(int argc, char **argv, char **envp) 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: #ifdef CONFIG_SDL |