OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu-option: do not suggest using the delay option

Browse Source 
The "delay" option was a hack that was introduced to allow writing "nodelay".
We are adding a "nodelay" option to be used as "nodelay=on", so recommend it
instead of "delay".

This is quite ugly, but a proper deprecation of "delay"
cannot be done if QEMU starts suggesting it.  Since it's the
only case I opted for this very much ad-hoc patch.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2021-02-25 11:51:30 +01:00
parent f3126d65b3
commit fe636424ca
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/system/deprecated.rst
View File

@ -134,6 +134,12 @@ Boolean options such as ``share=on``/``share=off`` could be written
in short form as ``share`` and ``noshare``. This is now deprecated in short form as ``share`` and ``noshare``. This is now deprecated
and will cause a warning. and will cause a warning.
``delay`` option for socket character devices (since 6.0)
'''''''''''''''''''''''''''''''''''''''''''''''''''''''''
The replacement for the ``nodelay`` short-form boolean option is ``nodelay=on``
rather than ``delay=off``.
``--enable-fips`` (since 6.0) ``--enable-fips`` (since 6.0)
''''''''''''''''''''''''''''' '''''''''''''''''''''''''''''

4
util/qemu-option.c
View File

@ -785,9 +785,13 @@ static const char *get_opt_name_value(const char *params,
} }
if (!is_help && warn_on_flag) { if (!is_help && warn_on_flag) {
warn_report("short-form boolean option '%s%s' deprecated", prefix, *name); warn_report("short-form boolean option '%s%s' deprecated", prefix, *name);
if (g_str_equal(*name, "delay")) {
error_printf("Please use nodelay=%s instead\n", prefix[0] ? "on" : "off");
} else {
error_printf("Please use %s=%s instead\n", *name, *value); error_printf("Please use %s=%s instead\n", *name, *value);
} }
} }
}
} else { } else {
/* found "foo=bar,more" */ /* found "foo=bar,more" */
p = get_opt_name(params, name, len); p = get_opt_name(params, name, len);