Skip to content

Commit

Permalink
qemu-options: Remove the deprecated -async-teardown option
Browse files Browse the repository at this point in the history
It's been marked as deprecated since QEMU 8.1 (and was only available
since QEMU 8.0 anyway), so it should be fine to remove this now.

Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240118103759.130748-4-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
  • Loading branch information
huth committed Jan 19, 2024
1 parent 4a64101 commit 2582489
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 21 deletions.
5 changes: 0 additions & 5 deletions docs/about/deprecated.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ as short-form boolean values, and passed to plugins as ``arg_name=on``.
However, short-form booleans are deprecated and full explicit ``arg_name=on``
form is preferred.

``-async-teardown`` (since 8.1)
'''''''''''''''''''''''''''''''

Use ``-run-with async-teardown=on`` instead.

``-chroot`` (since 8.1)
'''''''''''''''''''''''

Expand Down
5 changes: 5 additions & 0 deletions docs/about/removed-features.rst
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,11 @@ Use ``-machine hpet=off`` instead.
The ``-no-acpi`` setting has been turned into a machine property.
Use ``-machine acpi=off`` instead.

``-async-teardown`` (removed in 9.0)
''''''''''''''''''''''''''''''''''''

Use ``-run-with async-teardown=on`` instead.


QEMU Machine Protocol (QMP) commands
------------------------------------
Expand Down
10 changes: 0 additions & 10 deletions qemu-options.hx
Original file line number Diff line number Diff line change
Expand Up @@ -4977,16 +4977,6 @@ HXCOMM Internal use
DEF("qtest", HAS_ARG, QEMU_OPTION_qtest, "", QEMU_ARCH_ALL)
DEF("qtest-log", HAS_ARG, QEMU_OPTION_qtest_log, "", QEMU_ARCH_ALL)

#ifdef __linux__
DEF("async-teardown", 0, QEMU_OPTION_asyncteardown,
"-async-teardown enable asynchronous teardown\n",
QEMU_ARCH_ALL)
SRST
``-async-teardown``
This option is deprecated and should no longer be used. The new option
``-run-with async-teardown=on`` is a replacement.
ERST
#endif
#ifdef CONFIG_POSIX
DEF("run-with", HAS_ARG, QEMU_OPTION_run_with,
"-run-with [async-teardown=on|off][,chroot=dir]\n"
Expand Down
6 changes: 0 additions & 6 deletions system/vl.c
Original file line number Diff line number Diff line change
Expand Up @@ -3600,12 +3600,6 @@ void qemu_init(int argc, char **argv)
case QEMU_OPTION_daemonize:
os_set_daemonize(true);
break;
#if defined(CONFIG_LINUX)
/* deprecated */
case QEMU_OPTION_asyncteardown:
init_async_teardown();
break;
#endif
case QEMU_OPTION_run_with: {
const char *str;
opts = qemu_opts_parse_noisily(qemu_find_opts("run-with"),
Expand Down

0 comments on commit 2582489

Please sign in to comment.