On Fri, 28 Apr 2023 14:16:42 +0200 Thomas Huth <th...@redhat.com> wrote:
> On 28/04/2023 13.12, Claudio Imbrenda wrote: > > Add new -run-with option with an async-teardown=on|off parameter. It is > > visible in the output of query-command-line-options QMP command, so it > > can be discovered and used by libvirt. > > > > The option -async-teardown is now redundant, deprecate it. > > > > Reported-by: Boris Fiuczynski <fiu...@linux.ibm.com> > > Fixes: c891c24b1a ("os-posix: asynchronous teardown for shutdown on Linux") > > Signed-off-by: Claudio Imbrenda <imbre...@linux.ibm.com> > > --- > > docs/about/deprecated.rst | 5 +++++ > > os-posix.c | 15 +++++++++++++++ > > qemu-options.hx | 34 +++++++++++++++++++++++----------- > > util/async-teardown.c | 21 +++++++++++++++++++++ > > 4 files changed, 64 insertions(+), 11 deletions(-) > > > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > > index 1ca9dc33d6..0986db9a86 100644 > > --- a/docs/about/deprecated.rst > > +++ b/docs/about/deprecated.rst > > @@ -111,6 +111,11 @@ Use ``-machine acpi=off`` instead. > > The HAXM project has been retired (see > > https://github.com/intel/haxm#status). > > Use "whpx" (on Windows) or "hvf" (on macOS) instead. > > > > +``-async-teardown`` (since 8.1) > > +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, > > + > > +Use ``-run-with async-teardown=on`` instead. > > + > > > > QEMU Machine Protocol (QMP) commands > > ------------------------------------ > > diff --git a/os-posix.c b/os-posix.c > > index 5adc69f560..117ad2bdc1 100644 > > --- a/os-posix.c > > +++ b/os-posix.c > > @@ -36,6 +36,8 @@ > > #include "qemu/log.h" > > #include "sysemu/runstate.h" > > #include "qemu/cutils.h" > > +#include "qemu/config-file.h" > > +#include "qemu/option.h" > > > > #ifdef CONFIG_LINUX > > #include <sys/prctl.h> > > @@ -132,6 +134,8 @@ static bool os_parse_runas_uid_gid(const char *optarg) > > */ > > int os_parse_cmd_args(int index, const char *optarg) > > { > > + QemuOpts *opts; > > Fails to compile on FreeBSD: > > ../src/os-posix.c:137:15: error: unused variable 'opts' > [-Werror,-Wunused-variable] > QemuOpts *opts; > ^ > 1 error generated. > > Apart from that, the patch looks fine to me. oops, I'll move the variable inside the ifdef > > Thomas >