From nobody Mon Feb 9 21:19:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1644497171; cv=none; d=zohomail.com; s=zohoarc; b=H61klZZOgwuLW69pQ70vk3E1zlfFkOVl7W9bZ792VK8WAtJ1ijaT+3ry1nVReukXkbMhtEvhAJh2P1kQ+NfgIVMDL5q6bkXfYW3PbEPiWI7Ss+TBZY6x9D0ngWAVjYg6PLqu0M+9uO1SJwF19U53YStEF0MHVKcHzPvYvLQlDEg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644497171; 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=GLtB+j5ztlW0zs8SAaXDGn+eTqH9tRue4PGuaOlOkTQ=; b=g+gvVIWJxBqc3uu8y/KKY26KtwYZ5TfG85mwPh9xVzbpDhRz8weeaA16TkM3cRGQ0EYHgGXbrG0UQPFWBKAtkp+OWCM1r9lXaR12ZCsg+U2FzInzOg2H3tPhO7BR1PcTCNEROTG2/uheawR4OSVkoE1s1Xi/Y4zl+Ud/R4Lb6uc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1644497171447757.2664185342175; Thu, 10 Feb 2022 04:46:11 -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-558-brIivCs7MACijEyGYT56HA-1; Thu, 10 Feb 2022 07:46:06 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7C03F1B18BC1; Thu, 10 Feb 2022 12:46:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5898A6E205; Thu, 10 Feb 2022 12:46:01 +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 285601806D1C; Thu, 10 Feb 2022 12:46:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21ACjiSI026540 for ; Thu, 10 Feb 2022 07:45:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5536B78C30; Thu, 10 Feb 2022 12:45:44 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADD9578C2E for ; Thu, 10 Feb 2022 12:45:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644497170; 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=GLtB+j5ztlW0zs8SAaXDGn+eTqH9tRue4PGuaOlOkTQ=; b=NZzUk9NlTM322lI3L5VBM/p+lr/+bDs4/SbNmW0vy1txiomfGPvSelC7nHZSpDDjd3KNNb PeyRWXph1uBGZmGRtsz8ddO/Eus8fKiw6R2n/JUa/fyw558PDAYSSyszjhT9sDRSLo8WI3 VqXQM5uhuw7VOk5IcqpGfeCzTx8JIc4= X-MC-Unique: brIivCs7MACijEyGYT56HA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/19] qemuxml2argvtest: Add versioned test variants for pre-blockdev disk tests Date: Thu, 10 Feb 2022 13:45:22 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.11 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: 1644497172508100002 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. 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 --- .../disk-aio.x86_64-4.1.0.args | 36 ++++++++++++++ ...isk-backing-chains-index.x86_64-4.1.0.args | 45 +++++++++++++++++ ...k-backing-chains-noindex.x86_64-4.1.0.args | 45 +++++++++++++++++ .../disk-cache.x86_64-4.1.0.args | 42 ++++++++++++++++ .../disk-cdrom-network.x86_64-4.1.0.args | 37 ++++++++++++++ .../disk-cdrom-tray.x86_64-4.1.0.args | 38 ++++++++++++++ .../disk-cdrom.x86_64-4.1.0.args | 39 +++++++++++++++ .../disk-copy_on_read.x86_64-4.1.0.args | 39 +++++++++++++++ .../disk-detect-zeroes.x86_64-4.1.0.args | 37 ++++++++++++++ .../disk-error-policy-s390x.s390x-4.0.0.args | 35 +++++++++++++ .../disk-error-policy.x86_64-4.1.0.args | 37 ++++++++++++++ .../disk-floppy-q35.x86_64-4.1.0.args | 36 ++++++++++++++ .../disk-floppy.x86_64-4.1.0.args | 37 ++++++++++++++ .../disk-network-gluster.x86_64-4.1.0.args | 37 ++++++++++++++ .../disk-network-iscsi.x86_64-4.1.0.args | 49 +++++++++++++++++++ .../disk-network-nbd.x86_64-4.1.0.args | 41 ++++++++++++++++ .../disk-network-rbd.x86_64-4.1.0.args | 44 +++++++++++++++++ .../disk-network-sheepdog.x86_64-4.1.0.args | 35 +++++++++++++ ...disk-network-source-auth.x86_64-4.1.0.args | 40 +++++++++++++++ ...disk-network-tlsx509-nbd.x86_64-4.1.0.args | 35 +++++++++++++ ...isk-network-tlsx509-vxhs.x86_64-4.1.0.args | 41 ++++++++++++++++ .../disk-readonly-disk.x86_64-4.1.0.args | 36 ++++++++++++++ .../disk-shared.x86_64-4.1.0.args | 41 ++++++++++++++++ ...virtio-scsi-reservations.x86_64-4.1.0.args | 39 +++++++++++++++ .../floppy-drive-fat.x86_64-4.1.0.args | 35 +++++++++++++ tests/qemuxml2argvtest.c | 27 ++++++++++ 26 files changed, 1003 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64= -4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_= 64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.= args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.a= rgs create mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.= args create mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.= 0.0.args create mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.a= rgs create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.= 0.args create mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.= args create mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.ar= gs create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.ar= gs create mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1= .0.args create mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-= 4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-= 4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64= -4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.= args create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x8= 6_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.ar= gs [snipped] diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6cf35a0ebf..53f0706d85 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1391,17 +1391,23 @@ mymain(void) DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); + /* qemu-4.1 was the last qemu version which we didn't use -blockdev wi= th */ DO_TEST_CAPS_VER("disk-cdrom", "2.12.0"); + 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"); @@ -1414,8 +1420,10 @@ mymain(void) 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"); @@ -1423,43 +1431,56 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-dir"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-iso"); DO_TEST_CAPS_VER("disk-shared", "2.12.0"); + DO_TEST_CAPS_VER("disk-shared", "4.1.0"); DO_TEST_CAPS_LATEST("disk-shared"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-shared-qcow"); DO_TEST_CAPS_VER("disk-error-policy", "2.12.0"); + DO_TEST_CAPS_VER("disk-error-policy", "4.1.0"); DO_TEST_CAPS_LATEST("disk-error-policy"); DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "2.12.0"); + DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "4.0.0"); DO_TEST_CAPS_ARCH_LATEST("disk-error-policy-s390x", "s390x"); DO_TEST_CAPS_VER("disk-cache", "2.12.0"); + DO_TEST_CAPS_VER("disk-cache", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cache"); 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"); @@ -1484,6 +1505,7 @@ mymain(void) 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"); @@ -1492,10 +1514,12 @@ mymain(void) 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"); @@ -1512,8 +1536,10 @@ mymain(void) 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"); @@ -1541,6 +1567,7 @@ mymain(void) 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