From nobody Sun Feb 8 17:36:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1686671003; cv=none; d=zohomail.com; s=zohoarc; b=B3ij+V/cYJoUJuymlYncmIk7cc0lF/thERY98SLvVuyWJiyAXRg/JUFwO85r3bLI/38oqj2os+i8zDER/5TrTYHjQ2hWcat5/GVMmDLIWAPRuLaeELw9lnRaIzi3EB+k3vOp1t7Dv17S6B5woTYsNTq5W3FobdJmzvEn0fBa2Vk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686671003; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EdmxU+GGnylTpzNVIA0kHulJW65cfTH9Lw29JFI+xIk=; b=FCNTDawjWIehhkQtG1lFbrLX0ke/BXFK7iZ7j8TCEgLZz2zUmJgKvdM3iPqWCYmx1TxhOoDRMyuHIoqEpU1DKAAn7BabqdgKNESsC4J+z7auBC5L978ukRDlCqFTpUkvFbGokQyY5ivrDKB3oA8HX2+lTVVEsMVffO7dXiA1NfI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=reject dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1686671003585962.890688829729; Tue, 13 Jun 2023 08:43:23 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-127-tZfywC6EOmSZ7kfzbGDs3A-1; Tue, 13 Jun 2023 11:43:17 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 731FB811E8D; Tue, 13 Jun 2023 15:43:01 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 558E1C1604C; Tue, 13 Jun 2023 15:43:01 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 33E921946A47; Tue, 13 Jun 2023 15:43:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5F42F194658C for ; Tue, 13 Jun 2023 15:43:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4F8611C558; Tue, 13 Jun 2023 15:43:00 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4736B2907 for ; Tue, 13 Jun 2023 15:43:00 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1F704802E58 for ; Tue, 13 Jun 2023 15:43:00 +0000 (UTC) Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-414-9V2SuJc0Naixl87pFKqMXw-1; Tue, 13 Jun 2023 11:42:56 -0400 Received: from pps.filterd (m0353723.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35DFfWdR011482; Tue, 13 Jun 2023 15:42:54 GMT Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3r6u22rcpq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Jun 2023 15:42:53 +0000 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 35D3cXkQ008998; Tue, 13 Jun 2023 15:42:46 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma04fra.de.ibm.com (PPS) with ESMTPS id 3r4gt51p00-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Jun 2023 15:42:46 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 35DFghlY66060722 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 13 Jun 2023 15:42:44 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CF5CF20043; Tue, 13 Jun 2023 15:42:43 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 949722004E; Tue, 13 Jun 2023 15:42:43 +0000 (GMT) Received: from fiuczyvm.. (unknown [9.152.222.239]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 13 Jun 2023 15:42:43 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686671002; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=EdmxU+GGnylTpzNVIA0kHulJW65cfTH9Lw29JFI+xIk=; b=S+xV4x7DK/fqspzYnwiu1wQlUkSaTG5G95bhXeaTGS9HcJoVg7U9mq6t8a/WicvvkHT+2l v8lngywrhxe6xbryhGFweG7rNs2t+hPsAYpKI67Jq+uYFgpdmXyoVqJWMLWEesnNw9RKNH ALXKocQO52k6OPSl9fVCPLc31Z0dQl8= X-MC-Unique: tZfywC6EOmSZ7kfzbGDs3A-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 9V2SuJc0Naixl87pFKqMXw-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH 3/3] qemu: enable asynchronous teardown on s390x hosts Date: Tue, 13 Jun 2023 17:42:42 +0200 Message-Id: <20230613154242.35504-4-fiuczy@linux.ibm.com> In-Reply-To: <20230613154242.35504-1-fiuczy@linux.ibm.com> References: <20230613154242.35504-1-fiuczy@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: YmRAJAYICVvg-cYkzdkpAL0XJ8tKrgQo X-Proofpoint-GUID: YmRAJAYICVvg-cYkzdkpAL0XJ8tKrgQo X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-13_18,2023-06-12_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 phishscore=0 clxscore=1015 mlxscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 bulkscore=0 impostorscore=0 mlxlogscore=999 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306130137 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mprivozn@redhat.com, thuth@redhat.com, imbrenda@linux.ibm.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: linux.ibm.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1686671004437100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Enablement of asynchronous teardown on s390x and add a new test for asynchronous teardown not supported. Signed-off-by: Boris Fiuczynski Reviewed-by: Thomas Huth --- 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, } =20 =20 +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=3Dyes", NUL= L); + + return 0; +} + + typedef enum { QEMU_COMMAND_DEPRECATION_BEHAVIOR_NONE =3D 0, QEMU_COMMAND_DEPRECATION_BEHAVIOR_OMIT, @@ -10521,6 +10533,9 @@ qemuBuildCommandLine(virDomainObj *vm, if (qemuBuildCryptoCommandLine(cmd, def, qemuCaps) < 0) return NULL; =20 + if (qemuBuildTeardownCommandLine(cmd, qemuCaps) < 0) + return NULL; + if (cfg->logTimestamp) virCommandAddArgList(cmd, "-msg", "timestamp=3Don", NULL); =20 diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.s390x-latest.args b= /tests/qemuxml2argvdata/balloon-ccw-deflate.s390x-latest.args index f615448649..b6256ad37e 100644 --- a/tests/qemuxml2argvdata/balloon-ccw-deflate.s390x-latest.args +++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.s390x-latest.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","deflate-on-oom":t= rue,"devno":"fe.0.000a"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-sclp.s390x-latest.args b/tests/= qemuxml2argvdata/console-sclp.s390x-latest.args index 42537cc233..ccb5a82519 100644 --- a/tests/qemuxml2argvdata/console-sclp.s390x-latest.args +++ b/tests/qemuxml2argvdata/console-sclp.s390x-latest.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.s390x-latest.args b/= tests/qemuxml2argvdata/console-virtio-ccw.s390x-latest.args index 928c03de5a..1767a0aea7 100644 --- a/tests/qemuxml2argvdata/console-virtio-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/console-virtio-ccw.s390x-latest.args @@ -35,4 +35,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.000a= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-s390-features.s390x-latest.args b/t= ests/qemuxml2argvdata/cpu-s390-features.s390x-latest.args index d6c1d6e278..5a2f891290 100644 --- a/tests/qemuxml2argvdata/cpu-s390-features.s390x-latest.args +++ b/tests/qemuxml2argvdata/cpu-s390-features.s390x-latest.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest1/= .config \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.s390x-latest.args b/test= s/qemuxml2argvdata/cpu-s390-zEC12.s390x-latest.args index 8ad4fd90ce..4deed4ac5f 100644 --- a/tests/qemuxml2argvdata/cpu-s390-zEC12.s390x-latest.args +++ b/tests/qemuxml2argvdata/cpu-s390-zEC12.s390x-latest.args @@ -28,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest1/= .config \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.a= rgs b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args index ad8bc8df0f..b222ec050a 100644 --- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-default= -video-type-s/.config \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device '{"driver":"virtio-gpu-ccw","id":"video0","max_outputs":1,"devno":= "fe.0.0000"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.ar= gs b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args index dc86dd162e..d701846a84 100644 --- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0002","drive":"libvirt-1= -format","id":"virtio-disk2","write-cache":"on","werror":"report","rerror":= "ignore"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args = b/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args index 584f1ac203..2483c36185 100644 --- a/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args @@ -41,4 +41,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.000a= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args b/tes= ts/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args index 251d1ca919..da85213cdf 100644 --- a/tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args @@ -35,4 +35,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.000a= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args= b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args index 667be38d02..748ec5557a 100644 --- a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args b/tests/qemu= xml2argvdata/fs9p-ccw.s390x-latest.args index a10b7bf3b6..bb822e109c 100644 --- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args @@ -38,4 +38,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0004= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-lates= t.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.ar= gs index 3b327ee0b9..e5baf2f61a 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -device '{"driver":"vhost-scsi-ccw","wwpn":"naa.5123456789abcde0","vhostfd= ":"3","id":"hostdev0","devno":"fe.0.0002"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0003= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-lates= t.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.ar= gs index 9a531f864a..2a5c068143 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"vfio-ap","id":"hostdev0","sysfsdev":"/sys/bus/mdev/dev= ices/90c6c135-ad44-41d0-b1b7-bae47de48627"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x= -latest.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s39= 0x-latest.args index 35ca1f8e80..0d64c8f7ec 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest= .args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest= .args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"vfio-ccw","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/90c6c135-ad44-41d0-b1b7-bae47de48627","bootindex":1,"devno":"fe.0.000= 0"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-late= st.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.= args index 80d2aa6955..93af6282f6 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"vfio-ccw","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/90c6c135-ad44-41d0-b1b7-bae47de48627","devno":"fe.0.0000"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.s39= 0x-latest.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids= .s390x-latest.args index 3261839623..cc7b05ebef 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.s390x-late= st.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.s390x-late= st.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"vfio-pci","host":"0001:00:00.0","id":"hostdev1","bus":= "pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.s39= 0x-latest.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids= .s390x-latest.args index ea30b77795..314284f953 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.s390x-late= st.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.s390x-late= st.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"vfio-pci","host":"0000:00:01.0","id":"hostdev1","bus":= "pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.s390x-la= test.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.s390x-lat= est.args index f9b31cb30c..fb68ade55d 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.s390x-latest.ar= gs +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.s390x-latest.ar= gs @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"vfio-pci","host":"0000:00:00.0","id":"hostdev0","bus":= "pci.0","addr":"0x1"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-late= st.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-latest.= args index 68728dd663..5be66055bf 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-latest.args @@ -35,4 +35,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"vfio-pci","host":"0000:00:00.0","id":"hostdev1","bus":= "pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x-= latest.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x= -latest.args index 760edbc759..6c3dbc1ba9 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.= args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.= args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-KVMGues= t1/.config \ -device '{"driver":"vfio-pci","host":"0000:00:00.0","id":"hostdev0","bus":= "pci.0","addr":"0x1"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.s390= x-latest.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.s= 390x-latest.args index 10810b3434..d7bb8ebf42 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.s390x-lates= t.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.s390x-lates= t.args @@ -45,4 +45,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"vfio-pci","host":"0008:00:00.0","id":"hostdev7","bus":= "pci.0","addr":"0x6"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.s390x-latest.args b/t= ests/qemuxml2argvdata/hostdev-vfio-zpci.s390x-latest.args index da161e0153..1a9b2bc01d 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.s390x-latest.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"vfio-pci","host":"0000:00:00.0","id":"hostdev0","bus":= "pci.0","addr":"0x8"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.s390x-latest.args b/te= sts/qemuxml2argvdata/input-virtio-ccw.s390x-latest.args index 6fcd1eb05d..142aaf6581 100644 --- a/tests/qemuxml2argvdata/input-virtio-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/input-virtio-ccw.s390x-latest.args @@ -35,4 +35,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.= args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args index e4c045d739..1bcf066104 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -38,4 +38,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.000a= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.ar= gs b/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args index 50feb53e3c..43e5e1db1e 100644 --- a/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args +++ b/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -object '{"qom-type":"s390-pv-guest","id":"lsec0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.s390x-latest= .args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.s390x-latest.args index b6edb35107..c0013918f5 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.s390x-latest.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.s390x-lates= t.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.s390x-latest.ar= gs index b6edb35107..c0013918f5 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.s390x-latest.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.s390x-latest.= args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.s390x-latest.args index 74c52f9094..2b75d438d7 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.s390x-latest.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.s390x-latest= .args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.s390x-latest.args index 74c52f9094..2b75d438d7 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.s390x-latest.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.s390x-latest= .args b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.s390x-latest.args index 29f3330c1c..fa67dcb760 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.s390x-latest.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.s390x-lates= t.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.s390x-latest.ar= gs index 29f3330c1c..fa67dcb760 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.s390x-latest.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.s390x-latest.= args b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.s390x-latest.args index 1ed36c684b..c1f7c54da3 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.s390x-latest.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.s390x-latest= .args b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.s390x-latest.args index 1ed36c684b..c1f7c54da3 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.s390x-latest.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.= args b/tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args index 809b4e8acf..470e84f3d2 100644 --- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args = b/tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args index 809b4e8acf..470e84f3d2 100644 --- a/tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-loadparm-hostdev.s390x-latest.a= rgs b/tests/qemuxml2argvdata/machine-loadparm-hostdev.s390x-latest.args index 41deb43f37..1074becf05 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-hostdev.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-loadparm-hostdev.s390x-latest.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"vfio-ccw","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/90c6c135-ad44-41d0-b1b7-bae47de48627","bootindex":1,"devno":"fe.0.000= 0"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s3= 90.s390x-latest.args b/tests/qemuxml2argvdata/machine-loadparm-multiple-dis= ks-nets-s390.s390x-latest.args index d5c5a334be..bbc5fe28a5 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.s390= x-latest.args +++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.s390= x-latest.args @@ -39,4 +39,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-loadparm-net-s390.s390x-latest.= args b/tests/qemuxml2argvdata/machine-loadparm-net-s390.s390x-latest.args index 114d38cddc..f8c7463613 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-net-s390.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-loadparm-net-s390.s390x-latest.args @@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.s390x-latest.args= b/tests/qemuxml2argvdata/machine-loadparm-s390.s390x-latest.args index c8f0273ea8..5baca1d500 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-s390.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-loadparm-s390.s390x-latest.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.s390x-latest.args b/test= s/qemuxml2argvdata/net-virtio-ccw.s390x-latest.args index f7203db196..1231bbac07 100644 --- a/tests/qemuxml2argvdata/net-virtio-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/net-virtio-ccw.s390x-latest.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.000a= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/no-async-teardown-s390x.s390x-6.0.0.arg= s b/tests/qemuxml2argvdata/no-async-teardown-s390x.s390x-6.0.0.args new file mode 100644 index 0000000000..d072c50eae --- /dev/null +++ b/tests/qemuxml2argvdata/no-async-teardown-s390x.s390x-6.0.0.args @@ -0,0 +1,32 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=3Dtest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ +-machine s390-ccw-virtio-6.0,usb=3Doff,dump-guest-core=3Doff,memory-backen= d=3Ds390.ram \ +-accel kvm \ +-cpu gen15a-base,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag318=3Don,c= sske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa= 4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don,deflate= =3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,mepochptff=3Don,ap=3Don,vxe= h=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apqi=3Don,= apft=3Don,els=3Don,iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,p= pa15=3Don,zpci=3Don,sea_esop2=3Don,te=3Don,cmm=3Don \ +-m 256 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/no-async-teardown-s390x.xml b/tests/qem= uxml2argvdata/no-async-teardown-s390x.xml new file mode 100644 index 0000000000..e8e76cb372 --- /dev/null +++ b/tests/qemuxml2argvdata/no-async-teardown-s390x.xml @@ -0,0 +1,18 @@ + + test + 9aa4b45c-b9dd-45ef-91fe-862b27b4231f + 262144 + 262144 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-s390x + + diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-l= atest.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-l= atest.args index 8b11cff2f5..45998005c1 100644 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-latest.a= rgs +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-latest.a= rgs @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}'= \ -device '{"driver":"virtio-rng-ccw","rng":"objrng0","id":"rng0","devno":"f= e.0.0003"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.= args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args index 8b11cff2f5..45998005c1 100644 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}'= \ -device '{"driver":"virtio-rng-ccw","rng":"objrng0","id":"rng0","devno":"f= e.0.0003"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7= .s390x-latest.args index 561c69dc76..0cc3958c79 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-late= st.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2= .s390x-latest.args index ec143a63a1..77bd924e38 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-late= st.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7= .s390x-latest.args index 452d78c120..d985e1a36b 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-late= st.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2= .s390x-latest.args index b132972521..1255a6744a 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-late= st.args @@ -29,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-panic-missing.s390x-latest.args b/= tests/qemuxml2argvdata/s390-panic-missing.s390x-latest.args index dd8d1a99a6..04ba7fa69e 100644 --- a/tests/qemuxml2argvdata/s390-panic-missing.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-panic-missing.s390x-latest.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0002= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.s390x-latest.args= b/tests/qemuxml2argvdata/s390-panic-no-address.s390x-latest.args index 978d4c4279..9fe895329d 100644 --- a/tests/qemuxml2argvdata/s390-panic-no-address.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-panic-no-address.s390x-latest.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-serial-2.s390x-latest.args b/tests= /qemuxml2argvdata/s390-serial-2.s390x-latest.args index 75006f4c34..a56fadfe63 100644 --- a/tests/qemuxml2argvdata/s390-serial-2.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-serial-2.s390x-latest.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"sclplmconsole","chardev":"charserial1","id":"serial1"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-serial-console.s390x-latest.args b= /tests/qemuxml2argvdata/s390-serial-console.s390x-latest.args index 50c5826d42..0a22f200db 100644 --- a/tests/qemuxml2argvdata/s390-serial-console.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-serial-console.s390x-latest.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"sclpconsole","chardev":"charserial0","id":"serial0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-serial.s390x-latest.args b/tests/q= emuxml2argvdata/s390-serial.s390x-latest.args index 50c5826d42..0a22f200db 100644 --- a/tests/qemuxml2argvdata/s390-serial.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-serial.s390x-latest.args @@ -30,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"sclpconsole","chardev":"charserial0","id":"serial0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/= tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args index 63a46c48a9..b111c190e1 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args @@ -44,4 +44,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device '{"driver":"virtio-rng-ccw","rng":"objrng0","id":"rng0","devno":"f= e.0.0007"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/= tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args index 57d6af3913..85c707b032 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args @@ -41,4 +41,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device '{"driver":"virtio-rng-ccw","rng":"objrng0","id":"rng0","devno":"f= e.0.0004"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args = b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args index d73d813f38..c556ceaf3b 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -device '{"driver":"vhost-vsock-ccw","id":"vsock0","guest-cid":42,"vhostfd= ":"6789","devno":"fe.0.0002"}' \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args= b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args index a3f7a7eedf..1a6b090517 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -device '{"driver":"vhost-vsock-ccw","iommu_platform":true,"id":"vsock0","= guest-cid":4,"vhostfd":"6789","devno":"fe.0.0002"}' \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tes= ts/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args index ac2d3dc255..4ddd2c98ab 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args @@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -device '{"driver":"vhost-vsock-ccw","id":"vsock0","guest-cid":4,"vhostfd"= :"6789","devno":"fe.0.0003"}' \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.s390x-latest.args = b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.s390x-latest.args index d9f2f08d98..b0db3cc3f7 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.s390x-latest.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-gpu-ccw","id":"video1","max_outputs":1,"devno":= "fe.0.0003"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.s390x-latest.args b/test= s/qemuxml2argvdata/virtio-rng-ccw.s390x-latest.args index 2ba8382bbf..2501c35a93 100644 --- a/tests/qemuxml2argvdata/virtio-rng-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-ccw.s390x-latest.args @@ -37,4 +37,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}'= \ -device '{"driver":"virtio-rng-ccw","rng":"objrng0","id":"rng0","devno":"f= e.0.0002"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args b/te= sts/qemuxml2argvdata/watchdog-diag288.s390x-latest.args index 326a3c3d27..e94f714f8a 100644 --- a/tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args +++ b/tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args @@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -watchdog-action inject-nmi \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-run-with async-teardown=3Dyes \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d914d8cbea..a657e5143a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2699,6 +2699,8 @@ mymain(void) =20 DO_TEST_CAPS_LATEST("crypto-builtin"); =20 + DO_TEST_CAPS_ARCH_VER("no-async-teardown-s390x", "s390x", "6.0.0"); + qemuTestDriverFree(&driver); virFileWrapperClearPrefixes(); =20 --=20 2.39.0