diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-02-25 11:51:30 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-03-06 11:42:57 +0100 |
| commit | fe636424caabb4e8b5b96d8a994f58e321bd71d9 (patch) | |
| tree | 913bc6f2571cfa74a78f9ed929b58b73dc6e2776 | |
| parent | f3126d65b393c015e8f87763fdccee99bb1119af (diff) | |
| download | qemu-fe636424caabb4e8b5b96d8a994f58e321bd71d9.zip qemu-fe636424caabb4e8b5b96d8a994f58e321bd71d9.tar.gz qemu-fe636424caabb4e8b5b96d8a994f58e321bd71d9.tar.bz2 | |
qemu-option: do not suggest using the delay option
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>
| -rw-r--r-- | docs/system/deprecated.rst | 6 | ||||
| -rw-r--r-- | util/qemu-option.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index fcf0ca4..cfabe69 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -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 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) ''''''''''''''''''''''''''''' diff --git a/util/qemu-option.c b/util/qemu-option.c index 40564a1..9678d5b 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -785,7 +785,11 @@ static const char *get_opt_name_value(const char *params, } if (!is_help && warn_on_flag) { warn_report("short-form boolean option '%s%s' deprecated", prefix, *name); - error_printf("Please use %s=%s instead\n", *name, *value); + 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); + } } } } else { |