diff options
| author | Thomas Huth <thuth@redhat.com> | 2021-06-30 18:32:29 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-07-05 19:21:05 +0200 |
| commit | bb20b86db9acb7a6f653fd40c45d46a9df6b2a75 (patch) | |
| tree | b52bd981317a5319f3e8cf8b7110ff44462a94c5 | |
| parent | f6b560bbc1b0120d7737c0efb53f691828d82faa (diff) | |
ui: Fix the "-display sdl,window_close=..." parameter
According to the QAPI schema, there is a "-" and not a "_" between
"window" and "close", and we're also talking about "window-close"
in the long parameter description in qemu-options.hx, so we should
make sure that we rather use the variant with the "-" by default
instead of only allowing the one with the "_" here. The old way
still stays enabled for compatibility, but we deprecate it, so that
we can switch to a QAPIfied parameter one day more easily.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210630163231.467987-3-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 | 2 | ||||
| -rw-r--r-- | softmmu/vl.c | 7 |
3 files changed, 13 insertions, 2 deletions
diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index e2e0090878..bb624d3170 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -126,6 +126,12 @@ other options have been processed. This will either have no effect (if if they were not given. The property is therefore useless and should not be specified. +``-display sdl,window_close=...`` (since 6.1) +''''''''''''''''''''''''''''''''''''''''''''' + +Use ``-display sdl,window-close=...`` instead (i.e. with a minus instead of +an underscore between "window" and "close"). + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/qemu-options.hx b/qemu-options.hx index ba3ca9da1d..ae56fa4f28 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1784,7 +1784,7 @@ DEF("display", HAS_ARG, QEMU_OPTION_display, #endif #if defined(CONFIG_SDL) "-display sdl[,alt_grab=on|off][,ctrl_grab=on|off]\n" - " [,window_close=on|off][,gl=on|core|es|off]\n" + " [,window-close=on|off][,gl=on|core|es|off]\n" #endif #if defined(CONFIG_GTK) "-display gtk[,grab_on_hover=on|off][,gl=on|off]|\n" diff --git a/softmmu/vl.c b/softmmu/vl.c index cee6339580..36b761677d 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1089,7 +1089,12 @@ static void parse_display(const char *p) } else { goto invalid_sdl_args; } - } else if (strstart(opts, ",window_close=", &nextopt)) { + } else if (strstart(opts, ",window_close=", &nextopt) || + strstart(opts, ",window-close=", &nextopt)) { + if (strstart(opts, ",window_close=", NULL)) { + warn_report("window_close with an underscore is deprecated," + " please use window-close instead."); + } opts = nextopt; dpy.has_window_close = true; if (strstart(opts, "on", &nextopt)) { |