On 13/06/2023 17.42, Boris Fiuczynski wrote:
Enablement of asynchronous teardown on s390x and add a new test for asynchronous teardown not supported.
Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com> --- src/qemu/qemu_command.c | 15 +++++++++ .../balloon-ccw-deflate.s390x-latest.args | 1 + .../console-sclp.s390x-latest.args | 1 + .../console-virtio-ccw.s390x-latest.args | 1 + .../cpu-s390-features.s390x-latest.args | 1 + .../cpu-s390-zEC12.s390x-latest.args | 1 + ...default-video-type-s390x.s390x-latest.args | 1 + .../disk-error-policy-s390x.s390x-latest.args | 1 + .../disk-virtio-ccw-many.s390x-latest.args | 1 + .../disk-virtio-ccw.s390x-latest.args | 1 + .../disk-virtio-s390-zpci.s390x-latest.args | 1 + .../fs9p-ccw.s390x-latest.args | 1 + ...tdev-scsi-vhost-scsi-ccw.s390x-latest.args | 1 + ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 1 + ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 1 + ...dev-subsys-mdev-vfio-ccw.s390x-latest.args | 1 + ...o-zpci-autogenerate-fids.s390x-latest.args | 1 + ...o-zpci-autogenerate-uids.s390x-latest.args | 1 + ...v-vfio-zpci-autogenerate.s390x-latest.args | 1 + ...dev-vfio-zpci-boundaries.s390x-latest.args | 1 + ...vfio-zpci-ccw-memballoon.s390x-latest.args | 1 + ...io-zpci-multidomain-many.s390x-latest.args | 1 + .../hostdev-vfio-zpci.s390x-latest.args | 1 + .../input-virtio-ccw.s390x-latest.args | 1 + ...othreads-virtio-scsi-ccw.s390x-latest.args | 1 + .../launch-security-s390-pv.s390x-latest.args | 1 + ...chine-aeskeywrap-off-cap.s390x-latest.args | 1 + ...hine-aeskeywrap-off-caps.s390x-latest.args | 1 + ...achine-aeskeywrap-on-cap.s390x-latest.args | 1 + ...chine-aeskeywrap-on-caps.s390x-latest.args | 1 + ...chine-deakeywrap-off-cap.s390x-latest.args | 1 + ...hine-deakeywrap-off-caps.s390x-latest.args | 1 + ...achine-deakeywrap-on-cap.s390x-latest.args | 1 + ...chine-deakeywrap-on-caps.s390x-latest.args | 1 + ...achine-keywrap-none-caps.s390x-latest.args | 1 + .../machine-keywrap-none.s390x-latest.args | 1 + ...machine-loadparm-hostdev.s390x-latest.args | 1 + ...multiple-disks-nets-s390.s390x-latest.args | 1 + ...achine-loadparm-net-s390.s390x-latest.args | 1 + .../machine-loadparm-s390.s390x-latest.args | 1 + .../net-virtio-ccw.s390x-latest.args | 1 + .../no-async-teardown-s390x.s390x-6.0.0.args | 32 +++++++++++++++++++ .../no-async-teardown-s390x.xml | 18 +++++++++++ ...low-bogus-usb-controller.s390x-latest.args | 1 + ...390-allow-bogus-usb-none.s390x-latest.args | 1 + ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 1 + ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 1 + ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 1 + ...t-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 1 + .../s390-panic-missing.s390x-latest.args | 1 + .../s390-panic-no-address.s390x-latest.args | 1 + .../s390-serial-2.s390x-latest.args | 1 + .../s390-serial-console.s390x-latest.args | 1 + .../s390-serial.s390x-latest.args | 1 + .../s390x-ccw-graphics.s390x-latest.args | 1 + .../s390x-ccw-headless.s390x-latest.args | 1 + .../vhost-vsock-ccw-auto.s390x-latest.args | 1 + .../vhost-vsock-ccw-iommu.s390x-latest.args | 1 + .../vhost-vsock-ccw.s390x-latest.args | 1 + .../video-virtio-gpu-ccw.s390x-latest.args | 1 + .../virtio-rng-ccw.s390x-latest.args | 1 + .../watchdog-diag288.s390x-latest.args | 1 + tests/qemuxml2argvtest.c | 2 ++ 63 files changed, 126 insertions(+) create mode 100644 tests/qemuxml2argvdata/no-async-teardown-s390x.s390x-6.0.0.args create mode 100644 tests/qemuxml2argvdata/no-async-teardown-s390x.xml
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a19902988c..dfdc95bfa5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10166,6 +10166,18 @@ qemuBuildCryptoCommandLine(virCommand *cmd, }
+static int +qemuBuildTeardownCommandLine(virCommand *cmd, + virQEMUCaps *qemuCaps) +{ + if (ARCH_IS_S390(virArchFromHost()) && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN)) + virCommandAddArgList(cmd, "-run-with", "async-teardown=yes", NULL);
Using "=on" seems to be more common than using "=yes", so I'd maybe switch to "=on" here instead.
+ return 0; +}
Apart from that, patches look fine to me, so feel free to add: Reviewed-by: Thomas Huth <thuth@redhat.com>