From nobody Mon Feb 9 01:52:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1632315809; cv=none; d=zohomail.com; s=zohoarc; b=TX1cbk79hy7eHFm5/epZdKkMtrBvpaHGbh3/FqoKN58t/lu6irT6Y63Y5KgK4bgQawdvmROkziikyoqiaH+WnfD99rhz6sDXBx2b38arMsuxVh8yA089Ae8SBHb1HrGhe4BrJDO9acNxDB4qWRPE9c+T7TyjYCYp97Xq2vyS3eY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632315809; 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=2yz9WqTO3DLOEf8QfsjammpaunP2h3nSKoPdHeeY0Yo=; b=haO6lwj2LNJxY0EvsVgFdi1WAwwEmcPi2wzR00mCgfldmFAfBbobe+w+KTkNgIfbqysrqYKEkYmYA+thui3ceCr3q0WLj7f5YlubR1YQXHwIrY9X8djIqJ8aaGYKv9B4b3tlr0yAHBLXLrvdtJ9710P25uj7teCZt7VSUy+MVcQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1632315809868187.57581398719253; Wed, 22 Sep 2021 06:03:29 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-171-q3Cs2iNAM3iD1cryNy1x8w-1; Wed, 22 Sep 2021 09:03:26 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5D92F10247B2; Wed, 22 Sep 2021 13:03:20 +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 3B45C10016F5; Wed, 22 Sep 2021 13:03:20 +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 0A3A84EA3E; Wed, 22 Sep 2021 13:03:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18MD3Ioi020713 for ; Wed, 22 Sep 2021 09:03:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5BCD25DA2D; Wed, 22 Sep 2021 13:03:18 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C1CE5DEB8 for ; Wed, 22 Sep 2021 13:02:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632315808; 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=2yz9WqTO3DLOEf8QfsjammpaunP2h3nSKoPdHeeY0Yo=; b=eNxWHiyveQUv99k6+dYUU0/89FnLd4CwgEveQIwA36iy5fJT1AyCD3JIsDoo0+2DqEcyTK /QTHkekdW1qdYpMkj/pgvltS8ruG5xYToR02wzZkL/PvOFJHicIS/71HiG0lHrlOLhWI46 uYgnaXoL+Ywvn96HYxIB9bJnqehQ5gw= X-MC-Unique: q3Cs2iNAM3iD1cryNy1x8w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/20] qemuxml2argvtest: Use DO_TEST_CAPS_LATEST_PARSE_ERROR for disk cases Date: Wed, 22 Sep 2021 15:02:18 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.84 on 10.5.11.22 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: 1632315824590100001 Content-Type: text/plain; charset="utf-8" Convert all the disk-related negative cases to use 'latest' capabilities. The checks are mostly related to validation so using real capabilities doesn't influence the outcome. Signed-off-by: Peter Krempa --- ...> disk-address-conflict.x86_64-latest.err} | 0 ...device-lun-type-invalid.x86_64-latest.err} | 0 ...dc-incompatible-address.x86_64-latest.err} | 0 ...cow.err =3D> disk-fmt-cow.x86_64-latest.err} | 0 ...dir.err =3D> disk-fmt-dir.x86_64-latest.err} | 0 ...iso.err =3D> disk-fmt-iso.x86_64-latest.err} | 0 ...v-scsi-address-conflict.x86_64-latest.err} | 0 ...de-incompatible-address.x86_64-latest.err} | 0 ...-missing-target-invalid.x86_64-latest.err} | 0 ...auth-secrettype-invalid.x86_64-latest.err} | 0 ...i-auth-wrong-secrettype.x86_64-latest.err} | 0 ...etwork-source-auth-both.x86_64-latest.err} | 0 ...rr =3D> disk-same-targets.x86_64-latest.err} | 0 ...ta-incompatible-address.x86_64-latest.err} | 0 ...si-disk-vpd-build-error.x86_64-latest.err} | 0 ...si-incompatible-address.x86_64-latest.err} | 0 ...err =3D> disk-shared-qcow.x86_64-latest.err} | 0 ...pci.err =3D> disk-usb-pci.x86_64-latest.err} | 0 ...-drive-address-conflict.x86_64-latest.err} | 0 tests/qemuxml2argvtest.c | 48 ++++++++----------- 20 files changed, 19 insertions(+), 29 deletions(-) rename tests/qemuxml2argvdata/{disk-address-conflict.err =3D> disk-address= -conflict.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-device-lun-type-invalid.err =3D> disk-= device-lun-type-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-fdc-incompatible-address.err =3D> disk= -fdc-incompatible-address.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-fmt-cow.err =3D> disk-fmt-cow.x86_64-l= atest.err} (100%) rename tests/qemuxml2argvdata/{disk-fmt-dir.err =3D> disk-fmt-dir.x86_64-l= atest.err} (100%) rename tests/qemuxml2argvdata/{disk-fmt-iso.err =3D> disk-fmt-iso.x86_64-l= atest.err} (100%) rename tests/qemuxml2argvdata/{disk-hostdev-scsi-address-conflict.err =3D>= disk-hostdev-scsi-address-conflict.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-ide-incompatible-address.err =3D> disk= -ide-incompatible-address.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-missing-target-invalid.err =3D> disk-m= issing-target-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-network-iscsi-auth-secrettype-invalid.= err =3D> disk-network-iscsi-auth-secrettype-invalid.x86_64-latest.err} (100= %) rename tests/qemuxml2argvdata/{disk-network-iscsi-auth-wrong-secrettype.er= r =3D> disk-network-iscsi-auth-wrong-secrettype.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-network-source-auth-both.err =3D> disk= -network-source-auth-both.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-same-targets.err =3D> disk-same-target= s.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-sata-incompatible-address.err =3D> dis= k-sata-incompatible-address.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-scsi-disk-vpd-build-error.err =3D> dis= k-scsi-disk-vpd-build-error.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-scsi-incompatible-address.err =3D> dis= k-scsi-incompatible-address.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-shared-qcow.err =3D> disk-shared-qcow.= x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-usb-pci.err =3D> disk-usb-pci.x86_64-l= atest.err} (100%) rename tests/qemuxml2argvdata/{hostdevs-drive-address-conflict.err =3D> ho= stdevs-drive-address-conflict.x86_64-latest.err} (100%) diff --git a/tests/qemuxml2argvdata/disk-address-conflict.err b/tests/qemux= ml2argvdata/disk-address-conflict.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-address-conflict.err rename to tests/qemuxml2argvdata/disk-address-conflict.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-device-lun-type-invalid.err b/test= s/qemuxml2argvdata/disk-device-lun-type-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-device-lun-type-invalid.err rename to tests/qemuxml2argvdata/disk-device-lun-type-invalid.x86_64-latest= .err diff --git a/tests/qemuxml2argvdata/disk-fdc-incompatible-address.err b/tes= ts/qemuxml2argvdata/disk-fdc-incompatible-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-fdc-incompatible-address.err rename to tests/qemuxml2argvdata/disk-fdc-incompatible-address.x86_64-lates= t.err diff --git a/tests/qemuxml2argvdata/disk-fmt-cow.err b/tests/qemuxml2argvda= ta/disk-fmt-cow.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-fmt-cow.err rename to tests/qemuxml2argvdata/disk-fmt-cow.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-fmt-dir.err b/tests/qemuxml2argvda= ta/disk-fmt-dir.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-fmt-dir.err rename to tests/qemuxml2argvdata/disk-fmt-dir.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-fmt-iso.err b/tests/qemuxml2argvda= ta/disk-fmt-iso.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-fmt-iso.err rename to tests/qemuxml2argvdata/disk-fmt-iso.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.err = b/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.x86_64-latest.e= rr similarity index 100% rename from tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.err rename to tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.x86_64-= latest.err diff --git a/tests/qemuxml2argvdata/disk-ide-incompatible-address.err b/tes= ts/qemuxml2argvdata/disk-ide-incompatible-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-ide-incompatible-address.err rename to tests/qemuxml2argvdata/disk-ide-incompatible-address.x86_64-lates= t.err diff --git a/tests/qemuxml2argvdata/disk-missing-target-invalid.err b/tests= /qemuxml2argvdata/disk-missing-target-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-missing-target-invalid.err rename to tests/qemuxml2argvdata/disk-missing-target-invalid.x86_64-latest.= err diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-inva= lid.err b/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid= .x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-inval= id.err rename to tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid= .x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettyp= e.err b/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.x86= _64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype= .err rename to tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.x= 86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-network-source-auth-both.err b/tes= ts/qemuxml2argvdata/disk-network-source-auth-both.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-network-source-auth-both.err rename to tests/qemuxml2argvdata/disk-network-source-auth-both.x86_64-lates= t.err diff --git a/tests/qemuxml2argvdata/disk-same-targets.err b/tests/qemuxml2a= rgvdata/disk-same-targets.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-same-targets.err rename to tests/qemuxml2argvdata/disk-same-targets.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-sata-incompatible-address.err b/te= sts/qemuxml2argvdata/disk-sata-incompatible-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-sata-incompatible-address.err rename to tests/qemuxml2argvdata/disk-sata-incompatible-address.x86_64-late= st.err diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.err b/te= sts/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.err rename to tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.x86_64-late= st.err diff --git a/tests/qemuxml2argvdata/disk-scsi-incompatible-address.err b/te= sts/qemuxml2argvdata/disk-scsi-incompatible-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-incompatible-address.err rename to tests/qemuxml2argvdata/disk-scsi-incompatible-address.x86_64-late= st.err diff --git a/tests/qemuxml2argvdata/disk-shared-qcow.err b/tests/qemuxml2ar= gvdata/disk-shared-qcow.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-shared-qcow.err rename to tests/qemuxml2argvdata/disk-shared-qcow.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-usb-pci.err b/tests/qemuxml2argvda= ta/disk-usb-pci.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-usb-pci.err rename to tests/qemuxml2argvdata/disk-usb-pci.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.err b/t= ests/qemuxml2argvdata/hostdevs-drive-address-conflict.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdevs-drive-address-conflict.err rename to tests/qemuxml2argvdata/hostdevs-drive-address-conflict.x86_64-lat= est.err diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 39de7656e7..823270966e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1324,12 +1324,12 @@ mymain(void) DO_TEST_CAPS_VER("disk-readonly-disk", "2.12.0"); DO_TEST_CAPS_LATEST("disk-readonly-disk"); DO_TEST_NOCAPS("disk-fmt-qcow"); - DO_TEST_PARSE_ERROR_NOCAPS("disk-fmt-cow"); - DO_TEST_PARSE_ERROR_NOCAPS("disk-fmt-dir"); - DO_TEST_PARSE_ERROR_NOCAPS("disk-fmt-iso"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-cow"); + 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_LATEST("disk-shared"); - DO_TEST_PARSE_ERROR_NOCAPS("disk-shared-qcow"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-shared-qcow"); DO_TEST_CAPS_VER("disk-error-policy", "2.12.0"); DO_TEST_CAPS_LATEST("disk-error-policy"); DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "2.12.0"); @@ -1346,9 +1346,9 @@ mymain(void) QEMU_CAPS_SCSI_BLOCK); DO_TEST_CAPS_VER("disk-network-iscsi", "2.12.0"); DO_TEST_CAPS_LATEST("disk-network-iscsi"); - DO_TEST_PARSE_ERROR_NOCAPS("disk-network-iscsi-auth-secrettype-invalid= "); - DO_TEST_PARSE_ERROR_NOCAPS("disk-network-iscsi-auth-wrong-secrettype"); - DO_TEST_PARSE_ERROR_NOCAPS("disk-network-source-auth-both"); + 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_LATEST("disk-network-gluster"); DO_TEST_CAPS_VER("disk-network-rbd", "2.12.0"); @@ -1373,16 +1373,14 @@ mymain(void) DO_TEST_NOCAPS("disk-no-boot"); DO_TEST_CAPS_LATEST("disk-nvme"); DO_TEST_CAPS_LATEST("disk-vhostuser"); - DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid", - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-device-lun-type-invalid"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-attaching-partition-nosupport"); DO_TEST("disk-usb-device", QEMU_CAPS_DEVICE_USB_STORAGE); DO_TEST("disk-usb-device-removable", QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_USB_STORAGE_REMOVABLE); - DO_TEST_PARSE_ERROR("disk-usb-pci", - QEMU_CAPS_DEVICE_USB_STORAGE); + DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-usb-pci"); DO_TEST_CAPS_LATEST("disk-scsi"); DO_TEST_CAPS_LATEST("disk-scsi-device-auto"); DO_TEST("disk-scsi-disk-split", @@ -1391,8 +1389,7 @@ mymain(void) QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK= _WWN); DO_TEST("disk-scsi-disk-vpd", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK= _WWN); - DO_TEST_PARSE_ERROR("disk-scsi-disk-vpd-build-error", - QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK= _WWN); + DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-disk-vpd-build-error"); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); DO_TEST("disk-sata-device", QEMU_CAPS_ICH9_AHCI); @@ -1412,16 +1409,11 @@ mymain(void) DO_TEST_CAPS_VER("disk-detect-zeroes", "2.12.0"); DO_TEST_CAPS_LATEST("disk-detect-zeroes"); DO_TEST_NOCAPS("disk-snapshot"); - DO_TEST_PARSE_ERROR("disk-same-targets", - QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_DEVICE_USB_STORAGE); - DO_TEST_PARSE_ERROR("disk-missing-target-invalid", QEMU_CAPS_SCSI_LSI); - DO_TEST_PARSE_ERROR("disk-address-conflict", - QEMU_CAPS_ICH9_AHCI); - DO_TEST_PARSE_ERROR("disk-hostdev-scsi-address-conflict", - QEMU_CAPS_VIRTIO_SCSI); - DO_TEST_PARSE_ERROR("hostdevs-drive-address-conflict", - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-same-targets"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-missing-target-invalid"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-address-conflict"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-hostdev-scsi-address-conflict"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdevs-drive-address-conflict"); DO_TEST("event_idx", QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, QEMU_CAPS_VIRTIO_NET_EVENT_IDX, @@ -1433,12 +1425,10 @@ mymain(void) QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-serial", QEMU_CAPS_KVM); - DO_TEST_PARSE_ERROR_NOCAPS("disk-fdc-incompatible-address"); - DO_TEST_PARSE_ERROR_NOCAPS("disk-ide-incompatible-address"); - DO_TEST_PARSE_ERROR("disk-sata-incompatible-address", - QEMU_CAPS_ICH9_AHCI); - DO_TEST_PARSE_ERROR("disk-scsi-incompatible-address", - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fdc-incompatible-address"); + 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_LATEST("disk-backing-chains-index"); DO_TEST_CAPS_VER("disk-backing-chains-noindex", "2.12.0"); --=20 2.31.1