From nobody Sun Feb 8 21:29:10 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1644848628; cv=none; d=zohomail.com; s=zohoarc; b=fxCFo8BxvgSG84HbRSGoW7BqhWmSs0F62Ai73zVHK95WPL7i5i1NJPjficohJHZnphRyCDb7jjtn/nNkeqkv0wUbFXS/yyQuVn+o7EdTo4rqWLqDMWxYA8Vm0KvZYyX0h0PRc2QS1GCO6NKa9kz2GJfL5/JEqL4gAD/D4rZdT2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644848628; h=Content-Type:Content-Transfer-Encoding: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=ey+FUb2YdNNLkPReaBY0LjPL1qCCoKi6yDU2bbB4dtg=; b=NrhcDBdOgyOEuTulVgHKpK5aXsbVv3jt99N9drWbt8HkoaO00YTNJ3mjD/hmxGFSUDiQWi+KIbhy4U6GWj9W9YsL/C++8BnHBIK5LIMKyFUklfEvwYMYww2UWwhcpjyBFUqolTHBWNBIC4E0LU8ZKbKr2ydE0/b1IA/c6zWfskk= 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=pass header.from= (p=none 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 1644848628028649.0876185989787; Mon, 14 Feb 2022 06:23:48 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-341-kAK216eUOa-vms09N9S7mQ-1; Mon, 14 Feb 2022 09:23:43 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC0D61091DA8; Mon, 14 Feb 2022 14:23:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C446B7D4A3; Mon, 14 Feb 2022 14:23:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8AA8B4A7C9; Mon, 14 Feb 2022 14:23:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21EEN8Zh013888 for ; Mon, 14 Feb 2022 09:23:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id 885EF101E7E1; Mon, 14 Feb 2022 14:23:08 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id B89C0101E819 for ; Mon, 14 Feb 2022 14:23:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644848627; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=ey+FUb2YdNNLkPReaBY0LjPL1qCCoKi6yDU2bbB4dtg=; b=Ikhj64lS71AO1D3R2x65ecE6uqX7SRF0mWIktuqQ29/uL4HhfOWqlxir67zCjLSHbnHyxC qHRFA8vUyoaPWQa3Yq/yPuJhTUsGm62uuSSJZLUnOv8AhFvAhDeauMemKLEgQUmMOvVODo u3BjY/CNbkYXvE0KRxm9fVnL4Egqp8c= X-MC-Unique: kAK216eUOa-vms09N9S7mQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/5] qemuxml2argvtest: Bump versioned test variants for pre-blockdev disk tests to 4.1.0 Date: Mon, 14 Feb 2022 15:22:56 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1644848630422100005 Content-Type: text/plain; charset="utf-8" Originally when I started working on '-blockdev' support I added version locked variants of all the relevant disk tests locked to qemu-2.12, but blockdev was finally enabled with qemu-4.2. This patch bumps all of the test cases Upcoming patches will be removing support for qemu-2.12, but '-blockdev' is used only with qemu-4.2 and later. This patch adds variants locked to qemu-4.1 for all the disk tests that have a variant for 2.11 (with a slight exception of the 'disk-error-policy-s390x' case locked to qemu-4.0 as we don't have qemu-4.1 caps for s390x). Signed-off-by: Peter Krempa --- ...2.12.0.args =3D> disk-aio.x86_64-4.1.0.args} | 4 +- ...sk-backing-chains-index.x86_64-2.12.0.args | 1 - ...sk-backing-chains-index.x86_64-4.1.0.args} | 4 +- ...k-backing-chains-noindex.x86_64-4.1.0.args | 1 + ...s =3D> disk-cdrom-network.x86_64-4.1.0.args} | 4 +- ...args =3D> disk-cdrom-tray.x86_64-4.1.0.args} | 4 +- ...12.0.args =3D> disk-cdrom.x86_64-4.1.0.args} | 4 +- ...gs =3D> disk-copy_on_read.x86_64-4.1.0.args} | 4 +- ...s =3D> disk-detect-zeroes.x86_64-4.1.0.args} | 4 +- ...args =3D> disk-floppy-q35.x86_64-4.1.0.args} | 4 +- ...2.0.args =3D> disk-floppy.x86_64-4.1.0.args} | 4 +- ...=3D> disk-network-gluster.x86_64-4.1.0.args} | 4 +- ...s =3D> disk-network-iscsi.x86_64-4.1.0.args} | 4 +- ...rgs =3D> disk-network-nbd.x86_64-4.1.0.args} | 4 +- ...rgs =3D> disk-network-rbd.x86_64-4.1.0.args} | 4 +- ...> disk-network-sheepdog.x86_64-4.1.0.args} | 4 +- ...isk-network-source-auth.x86_64-4.1.0.args} | 4 +- ...isk-network-tlsx509-nbd.x86_64-4.1.0.args} | 4 +- ...sk-network-tlsx509-vxhs.x86_64-4.1.0.args} | 4 +- ...s =3D> disk-readonly-disk.x86_64-4.1.0.args} | 4 +- ...irtio-scsi-reservations.x86_64-4.1.0.args} | 4 +- ...rgs =3D> floppy-drive-fat.x86_64-4.1.0.args} | 4 +- tests/qemuxml2argvtest.c | 44 ++++++++++--------- 23 files changed, 64 insertions(+), 62 deletions(-) rename tests/qemuxml2argvdata/{disk-aio.x86_64-2.12.0.args =3D> disk-aio.x= 86_64-4.1.0.args} (94%) delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64= -2.12.0.args rename tests/qemuxml2argvdata/{disk-backing-chains-noindex.x86_64-2.12.0.a= rgs =3D> disk-backing-chains-index.x86_64-4.1.0.args} (96%) create mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_= 64-4.1.0.args rename tests/qemuxml2argvdata/{disk-cdrom-network.x86_64-2.12.0.args =3D> = disk-cdrom-network.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-cdrom-tray.x86_64-2.12.0.args =3D> dis= k-cdrom-tray.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-cdrom.x86_64-2.12.0.args =3D> disk-cdr= om.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-copy_on_read.x86_64-2.12.0.args =3D> d= isk-copy_on_read.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-detect-zeroes.x86_64-2.12.0.args =3D> = disk-detect-zeroes.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-floppy-q35.x86_64-2.12.0.args =3D> dis= k-floppy-q35.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-floppy.x86_64-2.12.0.args =3D> disk-fl= oppy.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-network-gluster.x86_64-2.12.0.args =3D= > disk-network-gluster.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-iscsi.x86_64-2.12.0.args =3D> = disk-network-iscsi.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-network-nbd.x86_64-2.12.0.args =3D> di= sk-network-nbd.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-rbd.x86_64-2.12.0.args =3D> di= sk-network-rbd.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-network-sheepdog.x86_64-2.12.0.args = =3D> disk-network-sheepdog.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-network-source-auth.x86_64-2.12.0.args= =3D> disk-network-source-auth.x86_64-4.1.0.args} (96%) rename tests/qemuxml2argvdata/{disk-network-tlsx509-nbd.x86_64-2.12.0.args= =3D> disk-network-tlsx509-nbd.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-tlsx509-vxhs.x86_64-2.12.0.arg= s =3D> disk-network-tlsx509-vxhs.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-readonly-disk.x86_64-2.12.0.args =3D> = disk-readonly-disk.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-virtio-scsi-reservations.x86_64-2.12.0= .args =3D> disk-virtio-scsi-reservations.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{floppy-drive-fat.x86_64-2.12.0.args =3D> fl= oppy-drive-fat.x86_64-4.1.0.args} (93%) diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args b/tests/qem= uxml2argvdata/disk-aio.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args index ff2b924345..c3b1b199c9 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0= .args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args deleted file mode 120000 index 3f4cd9040d..0000000000 --- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args +++ /dev/null @@ -1 +0,0 @@ -disk-backing-chains-noindex.x86_64-2.12.0.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12= .0.args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args similarity index 96% rename from tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.= 0.args rename to tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args index 5147cf93e6..77ffc8edb2 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.= 0.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.ar= gs new file mode 120000 index 0000000000..855fb35edd --- /dev/null +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args @@ -0,0 +1 @@ +disk-backing-chains-index.x86_64-4.1.0.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args b= /tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args index aca93dd5ea..00030f208d 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m 1024 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args b/te= sts/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args index 8cfd70ac6b..bbece87022 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= /master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 1024 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 3fa02811-7832-34bd-004d-1ff56a9286ff \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args b/tests/q= emuxml2argvdata/disk-cdrom.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args index d8dc6e81cd..443bbb67ae 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args b/= tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args index 0c96bf9718..db7b09ff4c 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= /master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 1024 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 468404ad-d49c-40f2-9e14-02294f9c1be3 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args b= /tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args index 910168b9fc..d7d78786a9 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args @@ -11,11 +11,11 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= /master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64 \ -m 1024 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 92d7a226-cfae-425b-a6d3-00bbf9ec5c9e \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args b/te= sts/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args index efd76d6436..42b95c3102 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args b/tests/= qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args index 86ebe72c05..1069bfa964 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args= b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args index 9a4adc8145..7611d4cfa7 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args b= /tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args similarity index 97% rename from tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args index a6bb026050..409ba8ab31 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args b/t= ests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args index 65d3d566a9..5792e906c2 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args b/t= ests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args similarity index 97% rename from tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args index fd2c4a35d3..3483853e39 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.arg= s b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args index a2afcc6140..c054ba308f 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.= args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args similarity index 96% rename from tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.a= rgs rename to tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args index ace4510c21..35d009bec6 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.= args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.a= rgs rename to tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args index 6f3b686822..ff8427b546 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0= .args b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args similarity index 97% rename from tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.= args rename to tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args index 4821140b93..b92beed6b5 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args b= /tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args index 0cef0675be..5fb40209d1 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.= 12.0.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1= .0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.1= 2.0.args rename to tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0= .args index d3d0197e65..b063f81e55 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.ar= gs +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args @@ -12,10 +12,10 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ -object pr-manager-helper,id=3Dpr-helper0,path=3D/tmp/lib/domain--1-QEMUGu= est1/pr-helper0.sock \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 8,sockets=3D8,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args b/t= ests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args similarity index 93% rename from tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args index 2f096d7d39..aa0795010d 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index eee540f24f..04f0eb2f3f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1312,17 +1312,18 @@ mymain(void) DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); - DO_TEST_CAPS_VER("disk-cdrom", "2.12.0"); + /* qemu-4.1 was the last qemu version which we didn't use -blockdev wi= th */ + DO_TEST_CAPS_VER("disk-cdrom", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom"); DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid"); DO_TEST_CAPS_LATEST("disk-cdrom-bus-other"); - DO_TEST_CAPS_VER("disk-cdrom-network", "2.12.0"); + DO_TEST_CAPS_VER("disk-cdrom-network", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom-network"); - DO_TEST_CAPS_VER("disk-cdrom-tray", "2.12.0"); + DO_TEST_CAPS_VER("disk-cdrom-tray", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom-tray"); - DO_TEST_CAPS_VER("disk-floppy", "2.12.0"); + DO_TEST_CAPS_VER("disk-floppy", "4.1.0"); DO_TEST_CAPS_LATEST("disk-floppy"); - DO_TEST_CAPS_VER("disk-floppy-q35", "2.12.0"); + DO_TEST_CAPS_VER("disk-floppy-q35", "4.1.0"); DO_TEST_CAPS_LATEST("disk-floppy-q35"); DO_TEST_CAPS_ARCH_LATEST_FAILURE("disk-floppy-pseries", "ppc64"); DO_TEST_CAPS_LATEST("disk-floppy-tray"); @@ -1334,9 +1335,9 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-virtio-queues"); DO_TEST_CAPS_LATEST("disk-boot-disk"); DO_TEST_CAPS_LATEST("disk-boot-cdrom"); - DO_TEST_CAPS_VER("floppy-drive-fat", "2.12.0"); + DO_TEST_CAPS_VER("floppy-drive-fat", "4.1.0"); DO_TEST_CAPS_LATEST("floppy-drive-fat"); - DO_TEST_CAPS_VER("disk-readonly-disk", "2.12.0"); + DO_TEST_CAPS_VER("disk-readonly-disk", "4.1.0"); DO_TEST_CAPS_LATEST("disk-readonly-disk"); DO_TEST_CAPS_VER("disk-fmt-qcow", "4.1.0"); DO_TEST_CAPS_LATEST("disk-fmt-qcow"); @@ -1359,32 +1360,33 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-metadata-cache"); DO_TEST_CAPS_ARCH_VER_PARSE_ERROR("disk-transient", "x86_64", "4.1.0"); DO_TEST_CAPS_LATEST("disk-transient"); - DO_TEST_CAPS_VER("disk-network-nbd", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-nbd", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-nbd"); - DO_TEST_CAPS_VER("disk-network-iscsi", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-iscsi", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-iscsi"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-in= valid"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrett= ype"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-source-auth-both"); - DO_TEST_CAPS_VER("disk-network-gluster", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-gluster", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-gluster"); - DO_TEST_CAPS_VER("disk-network-rbd", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-rbd", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-rbd"); DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-rbd-encryption", "6.0.0"); DO_TEST_CAPS_LATEST("disk-network-rbd-encryption"); DO_TEST_CAPS_VER_FAILURE("disk-network-rbd-no-colon", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-rbd-no-colon"); - DO_TEST_CAPS_VER("disk-network-sheepdog", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-sheepdog", "4.1.0"); + /* qemu-6.0 is the last qemu version supporting sheepdog */ DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0"); - DO_TEST_CAPS_VER("disk-network-source-auth", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-source-auth", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-source-auth"); DO_TEST_CAPS_LATEST("disk-network-nfs"); driver.config->vxhsTLS =3D 1; driver.config->nbdTLSx509secretUUID =3D g_strdup("6fd3f62d-9fe7-4a4e-a= 869-7acd6376d8ea"); driver.config->vxhsTLSx509secretUUID =3D g_strdup("6fd3f62d-9fe7-4a4e-= a869-7acd6376d8ea"); - DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "4.1.0"); DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "5.2.0"); - DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0"); DO_TEST_CAPS_LATEST("disk-network-http"); @@ -1408,7 +1410,7 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-disk-vpd-build-error"); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); DO_TEST_CAPS_LATEST("disk-sata-device"); - DO_TEST_CAPS_VER("disk-aio", "2.12.0"); + DO_TEST_CAPS_VER("disk-aio", "4.1.0"); DO_TEST_CAPS_LATEST("disk-aio"); DO_TEST_CAPS_LATEST("disk-aio-io_uring"); DO_TEST_CAPS_VER("disk-source-pool", "4.1.0"); @@ -1416,11 +1418,11 @@ mymain(void) DO_TEST_CAPS_VER("disk-source-pool-mode", "4.1.0"); DO_TEST_CAPS_LATEST("disk-source-pool-mode"); DO_TEST_CAPS_LATEST("disk-ioeventfd"); - DO_TEST_CAPS_VER("disk-copy_on_read", "2.12.0"); + DO_TEST_CAPS_VER("disk-copy_on_read", "4.1.0"); DO_TEST_CAPS_LATEST("disk-copy_on_read"); DO_TEST_CAPS_VER("disk-discard", "4.1.0"); DO_TEST_CAPS_LATEST("disk-discard"); - DO_TEST_CAPS_VER("disk-detect-zeroes", "2.12.0"); + DO_TEST_CAPS_VER("disk-detect-zeroes", "4.1.0"); DO_TEST_CAPS_LATEST("disk-detect-zeroes"); DO_TEST_CAPS_LATEST("disk-snapshot"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-same-targets"); @@ -1436,9 +1438,9 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-ide-incompatible-address"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-sata-incompatible-address"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-incompatible-address"); - DO_TEST_CAPS_VER("disk-backing-chains-index", "2.12.0"); + DO_TEST_CAPS_VER("disk-backing-chains-index", "4.1.0"); DO_TEST_CAPS_LATEST("disk-backing-chains-index"); - DO_TEST_CAPS_VER("disk-backing-chains-noindex", "2.12.0"); + DO_TEST_CAPS_VER("disk-backing-chains-noindex", "4.1.0"); DO_TEST_CAPS_LATEST("disk-backing-chains-noindex"); DO_TEST_CAPS_LATEST("disk-slices"); @@ -1465,7 +1467,7 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-geometry"); DO_TEST_CAPS_LATEST("disk-blockio"); - DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "2.12.0"); + DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "4.1.0"); DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); --=20 2.34.1