From nobody Sun Feb 8 20:58:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1532015489017353.2894545780788; Thu, 19 Jul 2018 08:51:29 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 0357930820D4; Thu, 19 Jul 2018 15:51:26 +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 3009F60BE5; Thu, 19 Jul 2018 15:51:25 +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 8FFEF18037ED; Thu, 19 Jul 2018 15:51:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpKUR028551 for ; Thu, 19 Jul 2018 11:51:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id C57D61C5A6; Thu, 19 Jul 2018 15:51:20 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2973F1C5B0 for ; Thu, 19 Jul 2018 15:51:20 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:50:53 +0200 Message-Id: <966421c31c6036d92b5736a0cd9f0eb178138f01.1532015294.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 01/24] tests: qemu: Drop 'drive' from disk tests 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 19 Jul 2018 15:51:27 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- ...ress-conflict.xml =3D> disk-address-conflict.xml} | 0 ...-drive-boot-cdrom.args =3D> disk-boot-cdrom.args} | 0 ...sk-drive-boot-cdrom.xml =3D> disk-boot-cdrom.xml} | 0 ...sk-drive-boot-disk.args =3D> disk-boot-disk.args} | 0 ...disk-drive-boot-disk.xml =3D> disk-boot-disk.xml} | 0 ...-directsync.args =3D> disk-cache-directsync.args} | 0 ...he-directsync.xml =3D> disk-cache-directsync.xml} | 0 ...ve-cache-unsafe.args =3D> disk-cache-unsafe.args} | 0 ...rive-cache-unsafe.xml =3D> disk-cache-unsafe.xml} | 0 ...-cache-v2-none.args =3D> disk-cache-v2-none.args} | 0 ...ve-cache-v2-none.xml =3D> disk-cache-v2-none.xml} | 0 ...rive-cache-v2-wb.args =3D> disk-cache-v2-wb.args} | 0 ...-drive-cache-v2-wb.xml =3D> disk-cache-v2-wb.xml} | 0 ...rive-cache-v2-wt.args =3D> disk-cache-v2-wt.args} | 0 ...-drive-cache-v2-wt.xml =3D> disk-cache-v2-wt.xml} | 0 ...rive-copy-on-read.xml =3D> disk-copy-on-read.xml} | 0 ...-detect-zeroes.args =3D> disk-detect-zeroes.args} | 0 ...ve-detect-zeroes.xml =3D> disk-detect-zeroes.xml} | 0 .../{disk-drive-discard.args =3D> disk-discard.args} | 0 .../{disk-drive-discard.xml =3D> disk-discard.xml} | 0 ...ve-error-policy.args =3D> disk-error-policy.args} | 0 ...t.args =3D> disk-error-policy.x86_64-latest.args} | 0 ...rive-error-policy.xml =3D> disk-error-policy.xml} | 0 .../{disk-drive-fmt-cow.xml =3D> disk-fmt-cow.xml} | 0 .../{disk-drive-fmt-dir.xml =3D> disk-fmt-dir.xml} | 0 .../{disk-drive-fmt-iso.xml =3D> disk-fmt-iso.xml} | 0 ...disk-drive-fmt-qcow.args =3D> disk-fmt-qcow.args} | 0 .../{disk-drive-fmt-qcow.xml =3D> disk-fmt-qcow.xml} | 0 ...sk-ide-drive-split.args =3D> disk-ide-split.args} | 0 ...disk-ide-drive-split.xml =3D> disk-ide-split.xml} | 0 ...work-gluster.args =3D> disk-network-gluster.args} | 0 ...etwork-gluster.xml =3D> disk-network-gluster.xml} | 0 ...disk-network-iscsi-auth-secrettype-invalid.xml} | 0 ...> disk-network-iscsi-auth-wrong-secrettype.xml} | 0 ...scsi-auth.args =3D> disk-network-iscsi-auth.args} | 0 ...-iscsi-auth.xml =3D> disk-network-iscsi-auth.xml} | 0 ...-iscsi-lun.args =3D> disk-network-iscsi-lun.args} | 0 ...rk-iscsi-lun.xml =3D> disk-network-iscsi-lun.xml} | 0 ...-network-iscsi.args =3D> disk-network-iscsi.args} | 0 ...ve-network-iscsi.xml =3D> disk-network-iscsi.xml} | 0 ...bd-export.args =3D> disk-network-nbd-export.args} | 0 ...-nbd-export.xml =3D> disk-network-nbd-export.xml} | 0 ...port.args =3D> disk-network-nbd-ipv6-export.args} | 0 ...export.xml =3D> disk-network-nbd-ipv6-export.xml} | 0 ...rk-nbd-ipv6.args =3D> disk-network-nbd-ipv6.args} | 0 ...work-nbd-ipv6.xml =3D> disk-network-nbd-ipv6.xml} | 0 ...rk-nbd-unix.args =3D> disk-network-nbd-unix.args} | 0 ...work-nbd-unix.xml =3D> disk-network-nbd-unix.xml} | 0 ...rive-network-nbd.args =3D> disk-network-nbd.args} | 0 ...-drive-network-nbd.xml =3D> disk-network-nbd.xml} | 0 ...uth-AES.args =3D> disk-network-rbd-auth-AES.args} | 0 ...-auth-AES.xml =3D> disk-network-rbd-auth-AES.xml} | 0 ...rk-rbd-auth.args =3D> disk-network-rbd-auth.args} | 0 ...work-rbd-auth.xml =3D> disk-network-rbd-auth.xml} | 0 ...eph-env.args =3D> disk-network-rbd-ceph-env.args} | 0 ...-ceph-env.xml =3D> disk-network-rbd-ceph-env.xml} | 0 ...rk-rbd-ipv6.args =3D> disk-network-rbd-ipv6.args} | 0 ...work-rbd-ipv6.xml =3D> disk-network-rbd-ipv6.xml} | 0 ...-no-colon.xml =3D> disk-network-rbd-no-colon.xml} | 0 ...rive-network-rbd.args =3D> disk-network-rbd.args} | 0 ...-drive-network-rbd.xml =3D> disk-network-rbd.xml} | 0 ...rk-sheepdog.args =3D> disk-network-sheepdog.args} | 0 ...work-sheepdog.xml =3D> disk-network-sheepdog.xml} | 0 ...-both.xml =3D> disk-network-source-auth-both.xml} | 0 ...rce-auth.args =3D> disk-network-source-auth.args} | 0 ...ource-auth.xml =3D> disk-network-source-auth.xml} | 0 ...work-tlsx509.args =3D> disk-network-tlsx509.args} | 0 ...etwork-tlsx509.xml =3D> disk-network-tlsx509.xml} | 0 ...ve-network-vxhs.args =3D> disk-network-vxhs.args} | 0 ...rive-network-vxhs.xml =3D> disk-network-vxhs.xml} | 0 .../{disk-drive-no-boot.args =3D> disk-no-boot.args} | 0 .../{disk-drive-no-boot.xml =3D> disk-no-boot.xml} | 0 ...-readonly-disk.args =3D> disk-readonly-disk.args} | 0 ...ve-readonly-disk.xml =3D> disk-readonly-disk.xml} | 0 ...no-device.args =3D> disk-readonly-no-device.args} | 0 ...y-no-device.xml =3D> disk-readonly-no-device.xml} | 0 ...hared-locking.args =3D> disk-shared-locking.args} | 0 ...-shared-locking.xml =3D> disk-shared-locking.xml} | 0 ...-drive-shared-qcow.xml =3D> disk-shared-qcow.xml} | 0 .../{disk-drive-shared.args =3D> disk-shared.args} | 0 .../{disk-drive-shared.xml =3D> disk-shared.xml} | 0 ...o-drive-queues.args =3D> disk-virtio-queues.args} | 0 ...tio-drive-queues.xml =3D> disk-virtio-queues.xml} | 0 ...6.0.args =3D> disk-write-cache.x86_64-2.6.0.args} | 0 ...7.0.args =3D> disk-write-cache.x86_64-2.7.0.args} | 0 ...st.args =3D> disk-write-cache.x86_64-latest.args} | 0 ...-drive-write-cache.xml =3D> disk-write-cache.xml} | 0 tests/qemuxml2argvtest.c | 96 +++++++++++-------= ---- ...sk-drive-boot-cdrom.xml =3D> disk-boot-cdrom.xml} | 0 ...disk-drive-boot-disk.xml =3D> disk-boot-disk.xml} | 0 ...he-directsync.xml =3D> disk-cache-directsync.xml} | 0 ...rive-cache-unsafe.xml =3D> disk-cache-unsafe.xml} | 0 ...ve-cache-v2-none.xml =3D> disk-cache-v2-none.xml} | 0 ...-drive-cache-v2-wb.xml =3D> disk-cache-v2-wb.xml} | 0 ...-drive-cache-v2-wt.xml =3D> disk-cache-v2-wt.xml} | 0 ...rive-copy-on-read.xml =3D> disk-copy-on-read.xml} | 0 tests/qemuxml2xmloutdata/disk-detect-zeroes.xml | 1 + .../{disk-drive-discard.xml =3D> disk-discard.xml} | 0 .../disk-drive-detect-zeroes.xml | 1 - ...rive-error-policy.xml =3D> disk-error-policy.xml} | 0 .../{disk-drive-fat.xml =3D> disk-fat.xml} | 0 .../{disk-drive-fmt-qcow.xml =3D> disk-fmt-qcow.xml} | 0 ...etwork-gluster.xml =3D> disk-network-gluster.xml} | 0 ...-iscsi-auth.xml =3D> disk-network-iscsi-auth.xml} | 0 ...ve-network-iscsi.xml =3D> disk-network-iscsi.xml} | 0 ...-nbd-export.xml =3D> disk-network-nbd-export.xml} | 0 ...export.xml =3D> disk-network-nbd-ipv6-export.xml} | 0 ...work-nbd-ipv6.xml =3D> disk-network-nbd-ipv6.xml} | 0 ...work-nbd-unix.xml =3D> disk-network-nbd-unix.xml} | 0 ...-drive-network-nbd.xml =3D> disk-network-nbd.xml} | 0 ...work-rbd-auth.xml =3D> disk-network-rbd-auth.xml} | 0 ...-ceph-env.xml =3D> disk-network-rbd-ceph-env.xml} | 0 ...work-rbd-ipv6.xml =3D> disk-network-rbd-ipv6.xml} | 0 ...-drive-network-rbd.xml =3D> disk-network-rbd.xml} | 0 ...work-sheepdog.xml =3D> disk-network-sheepdog.xml} | 0 ...ource-auth.xml =3D> disk-network-source-auth.xml} | 0 ...etwork-tlsx509.xml =3D> disk-network-tlsx509.xml} | 0 ...rive-network-vxhs.xml =3D> disk-network-vxhs.xml} | 0 ...tio-drive-queues.xml =3D> disk-virtio-queues.xml} | 0 tests/qemuxml2xmltest.c | 58 ++++++------- 120 files changed, 78 insertions(+), 78 deletions(-) rename tests/qemuxml2argvdata/{disk-drive-address-conflict.xml =3D> disk-a= ddress-conflict.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-cdrom.args =3D> disk-boot-c= drom.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-cdrom.xml =3D> disk-boot-cd= rom.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-disk.args =3D> disk-boot-di= sk.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-disk.xml =3D> disk-boot-dis= k.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-directsync.args =3D> disk-= cache-directsync.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-directsync.xml =3D> disk-c= ache-directsync.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-unsafe.args =3D> disk-cach= e-unsafe.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-unsafe.xml =3D> disk-cache= -unsafe.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-none.args =3D> disk-cac= he-v2-none.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-none.xml =3D> disk-cach= e-v2-none.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-wb.args =3D> disk-cache= -v2-wb.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-wb.xml =3D> disk-cache-= v2-wb.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-wt.args =3D> disk-cache= -v2-wt.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-cache-v2-wt.xml =3D> disk-cache-= v2-wt.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-copy-on-read.xml =3D> disk-copy-= on-read.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-detect-zeroes.args =3D> disk-det= ect-zeroes.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-detect-zeroes.xml =3D> disk-dete= ct-zeroes.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-discard.args =3D> disk-discard.a= rgs} (100%) rename tests/qemuxml2argvdata/{disk-drive-discard.xml =3D> disk-discard.xm= l} (100%) rename tests/qemuxml2argvdata/{disk-drive-error-policy.args =3D> disk-erro= r-policy.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-error-policy.x86_64-latest.args = =3D> disk-error-policy.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-error-policy.xml =3D> disk-error= -policy.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-cow.xml =3D> disk-fmt-cow.xm= l} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-dir.xml =3D> disk-fmt-dir.xm= l} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-iso.xml =3D> disk-fmt-iso.xm= l} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-qcow.args =3D> disk-fmt-qcow= .args} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-qcow.xml =3D> disk-fmt-qcow.= xml} (100%) rename tests/qemuxml2argvdata/{disk-ide-drive-split.args =3D> disk-ide-spl= it.args} (100%) rename tests/qemuxml2argvdata/{disk-ide-drive-split.xml =3D> disk-ide-spli= t.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-gluster.args =3D> disk-n= etwork-gluster.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-gluster.xml =3D> disk-ne= twork-gluster.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth-secrettype-in= valid.xml =3D> disk-network-iscsi-auth-secrettype-invalid.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth-wrong-secrett= ype.xml =3D> disk-network-iscsi-auth-wrong-secrettype.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth.args =3D> dis= k-network-iscsi-auth.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth.xml =3D> disk= -network-iscsi-auth.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-lun.args =3D> disk= -network-iscsi-lun.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-lun.xml =3D> disk-= network-iscsi-lun.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi.args =3D> disk-net= work-iscsi.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi.xml =3D> disk-netw= ork-iscsi.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-export.args =3D> dis= k-network-nbd-export.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-export.xml =3D> disk= -network-nbd-export.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-ipv6-export.args =3D= > disk-network-nbd-ipv6-export.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-ipv6-export.xml =3D>= disk-network-nbd-ipv6-export.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-ipv6.args =3D> disk-= network-nbd-ipv6.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-ipv6.xml =3D> disk-n= etwork-nbd-ipv6.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-unix.args =3D> disk-= network-nbd-unix.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd-unix.xml =3D> disk-n= etwork-nbd-unix.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd.args =3D> disk-netwo= rk-nbd.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-nbd.xml =3D> disk-networ= k-nbd.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth-AES.args =3D> d= isk-network-rbd-auth-AES.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth-AES.xml =3D> di= sk-network-rbd-auth-AES.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth.args =3D> disk-= network-rbd-auth.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth.xml =3D> disk-n= etwork-rbd-auth.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-ceph-env.args =3D> d= isk-network-rbd-ceph-env.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-ceph-env.xml =3D> di= sk-network-rbd-ceph-env.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-ipv6.args =3D> disk-= network-rbd-ipv6.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-ipv6.xml =3D> disk-n= etwork-rbd-ipv6.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-no-colon.xml =3D> di= sk-network-rbd-no-colon.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd.args =3D> disk-netwo= rk-rbd.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd.xml =3D> disk-networ= k-rbd.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-sheepdog.args =3D> disk-= network-sheepdog.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-sheepdog.xml =3D> disk-n= etwork-sheepdog.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth-both.xml =3D= > disk-network-source-auth-both.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth.args =3D> di= sk-network-source-auth.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth.xml =3D> dis= k-network-source-auth.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509.args =3D> disk-n= etwork-tlsx509.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509.xml =3D> disk-ne= twork-tlsx509.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-vxhs.args =3D> disk-netw= ork-vxhs.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-vxhs.xml =3D> disk-netwo= rk-vxhs.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-no-boot.args =3D> disk-no-boot.a= rgs} (100%) rename tests/qemuxml2argvdata/{disk-drive-no-boot.xml =3D> disk-no-boot.xm= l} (100%) rename tests/qemuxml2argvdata/{disk-drive-readonly-disk.args =3D> disk-rea= donly-disk.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-readonly-disk.xml =3D> disk-read= only-disk.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-readonly-no-device.args =3D> dis= k-readonly-no-device.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-readonly-no-device.xml =3D> disk= -readonly-no-device.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-locking.args =3D> disk-sh= ared-locking.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-locking.xml =3D> disk-sha= red-locking.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-qcow.xml =3D> disk-shared= -qcow.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared.args =3D> disk-shared.arg= s} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared.xml =3D> disk-shared.xml}= (100%) rename tests/qemuxml2argvdata/{disk-virtio-drive-queues.args =3D> disk-vir= tio-queues.args} (100%) rename tests/qemuxml2argvdata/{disk-virtio-drive-queues.xml =3D> disk-virt= io-queues.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-2.6.0.args = =3D> disk-write-cache.x86_64-2.6.0.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-2.7.0.args = =3D> disk-write-cache.x86_64-2.7.0.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-latest.args = =3D> disk-write-cache.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.xml =3D> disk-write-= cache.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-boot-cdrom.xml =3D> disk-boot-= cdrom.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-boot-disk.xml =3D> disk-boot-d= isk.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-cache-directsync.xml =3D> disk= -cache-directsync.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-cache-unsafe.xml =3D> disk-cac= he-unsafe.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-cache-v2-none.xml =3D> disk-ca= che-v2-none.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-cache-v2-wb.xml =3D> disk-cach= e-v2-wb.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-cache-v2-wt.xml =3D> disk-cach= e-v2-wt.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-copy-on-read.xml =3D> disk-cop= y-on-read.xml} (100%) create mode 120000 tests/qemuxml2xmloutdata/disk-detect-zeroes.xml rename tests/qemuxml2xmloutdata/{disk-drive-discard.xml =3D> disk-discard.= xml} (100%) delete mode 120000 tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml rename tests/qemuxml2xmloutdata/{disk-drive-error-policy.xml =3D> disk-err= or-policy.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-fat.xml =3D> disk-fat.xml} (10= 0%) rename tests/qemuxml2xmloutdata/{disk-drive-fmt-qcow.xml =3D> disk-fmt-qco= w.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-gluster.xml =3D> disk-= network-gluster.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-iscsi-auth.xml =3D> di= sk-network-iscsi-auth.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-iscsi.xml =3D> disk-ne= twork-iscsi.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-nbd-export.xml =3D> di= sk-network-nbd-export.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-nbd-ipv6-export.xml = =3D> disk-network-nbd-ipv6-export.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-nbd-ipv6.xml =3D> disk= -network-nbd-ipv6.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-nbd-unix.xml =3D> disk= -network-nbd-unix.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-nbd.xml =3D> disk-netw= ork-nbd.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd-auth.xml =3D> disk= -network-rbd-auth.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd-ceph-env.xml =3D> = disk-network-rbd-ceph-env.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd-ipv6.xml =3D> disk= -network-rbd-ipv6.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd.xml =3D> disk-netw= ork-rbd.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-sheepdog.xml =3D> disk= -network-sheepdog.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-source-auth.xml =3D> d= isk-network-source-auth.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-tlsx509.xml =3D> disk-= network-tlsx509.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-vxhs.xml =3D> disk-net= work-vxhs.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-virtio-drive-queues.xml =3D> disk-vi= rtio-queues.xml} (100%) diff --git a/tests/qemuxml2argvdata/disk-drive-address-conflict.xml b/tests= /qemuxml2argvdata/disk-address-conflict.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-address-conflict.xml rename to tests/qemuxml2argvdata/disk-address-conflict.xml diff --git a/tests/qemuxml2argvdata/disk-drive-boot-cdrom.args b/tests/qemu= xml2argvdata/disk-boot-cdrom.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-boot-cdrom.args rename to tests/qemuxml2argvdata/disk-boot-cdrom.args diff --git a/tests/qemuxml2argvdata/disk-drive-boot-cdrom.xml b/tests/qemux= ml2argvdata/disk-boot-cdrom.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-boot-cdrom.xml rename to tests/qemuxml2argvdata/disk-boot-cdrom.xml diff --git a/tests/qemuxml2argvdata/disk-drive-boot-disk.args b/tests/qemux= ml2argvdata/disk-boot-disk.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-boot-disk.args rename to tests/qemuxml2argvdata/disk-boot-disk.args diff --git a/tests/qemuxml2argvdata/disk-drive-boot-disk.xml b/tests/qemuxm= l2argvdata/disk-boot-disk.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-boot-disk.xml rename to tests/qemuxml2argvdata/disk-boot-disk.xml diff --git a/tests/qemuxml2argvdata/disk-drive-cache-directsync.args b/test= s/qemuxml2argvdata/disk-cache-directsync.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-directsync.args rename to tests/qemuxml2argvdata/disk-cache-directsync.args diff --git a/tests/qemuxml2argvdata/disk-drive-cache-directsync.xml b/tests= /qemuxml2argvdata/disk-cache-directsync.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-directsync.xml rename to tests/qemuxml2argvdata/disk-cache-directsync.xml diff --git a/tests/qemuxml2argvdata/disk-drive-cache-unsafe.args b/tests/qe= muxml2argvdata/disk-cache-unsafe.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-unsafe.args rename to tests/qemuxml2argvdata/disk-cache-unsafe.args diff --git a/tests/qemuxml2argvdata/disk-drive-cache-unsafe.xml b/tests/qem= uxml2argvdata/disk-cache-unsafe.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-unsafe.xml rename to tests/qemuxml2argvdata/disk-cache-unsafe.xml diff --git a/tests/qemuxml2argvdata/disk-drive-cache-v2-none.args b/tests/q= emuxml2argvdata/disk-cache-v2-none.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-v2-none.args rename to tests/qemuxml2argvdata/disk-cache-v2-none.args diff --git a/tests/qemuxml2argvdata/disk-drive-cache-v2-none.xml b/tests/qe= muxml2argvdata/disk-cache-v2-none.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-v2-none.xml rename to tests/qemuxml2argvdata/disk-cache-v2-none.xml diff --git a/tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args b/tests/qem= uxml2argvdata/disk-cache-v2-wb.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args rename to tests/qemuxml2argvdata/disk-cache-v2-wb.args diff --git a/tests/qemuxml2argvdata/disk-drive-cache-v2-wb.xml b/tests/qemu= xml2argvdata/disk-cache-v2-wb.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-v2-wb.xml rename to tests/qemuxml2argvdata/disk-cache-v2-wb.xml diff --git a/tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args b/tests/qem= uxml2argvdata/disk-cache-v2-wt.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args rename to tests/qemuxml2argvdata/disk-cache-v2-wt.args diff --git a/tests/qemuxml2argvdata/disk-drive-cache-v2-wt.xml b/tests/qemu= xml2argvdata/disk-cache-v2-wt.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-cache-v2-wt.xml rename to tests/qemuxml2argvdata/disk-cache-v2-wt.xml diff --git a/tests/qemuxml2argvdata/disk-drive-copy-on-read.xml b/tests/qem= uxml2argvdata/disk-copy-on-read.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-copy-on-read.xml rename to tests/qemuxml2argvdata/disk-copy-on-read.xml diff --git a/tests/qemuxml2argvdata/disk-drive-detect-zeroes.args b/tests/q= emuxml2argvdata/disk-detect-zeroes.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-detect-zeroes.args rename to tests/qemuxml2argvdata/disk-detect-zeroes.args diff --git a/tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml b/tests/qe= muxml2argvdata/disk-detect-zeroes.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml rename to tests/qemuxml2argvdata/disk-detect-zeroes.xml diff --git a/tests/qemuxml2argvdata/disk-drive-discard.args b/tests/qemuxml= 2argvdata/disk-discard.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-discard.args rename to tests/qemuxml2argvdata/disk-discard.args diff --git a/tests/qemuxml2argvdata/disk-drive-discard.xml b/tests/qemuxml2= argvdata/disk-discard.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-discard.xml rename to tests/qemuxml2argvdata/disk-discard.xml diff --git a/tests/qemuxml2argvdata/disk-drive-error-policy.args b/tests/qe= muxml2argvdata/disk-error-policy.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-error-policy.args rename to tests/qemuxml2argvdata/disk-error-policy.args diff --git a/tests/qemuxml2argvdata/disk-drive-error-policy.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-error-policy.x86_64-latest.ar= gs rename to tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-drive-error-policy.xml b/tests/qem= uxml2argvdata/disk-error-policy.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-error-policy.xml rename to tests/qemuxml2argvdata/disk-error-policy.xml diff --git a/tests/qemuxml2argvdata/disk-drive-fmt-cow.xml b/tests/qemuxml2= argvdata/disk-fmt-cow.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-fmt-cow.xml rename to tests/qemuxml2argvdata/disk-fmt-cow.xml diff --git a/tests/qemuxml2argvdata/disk-drive-fmt-dir.xml b/tests/qemuxml2= argvdata/disk-fmt-dir.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-fmt-dir.xml rename to tests/qemuxml2argvdata/disk-fmt-dir.xml diff --git a/tests/qemuxml2argvdata/disk-drive-fmt-iso.xml b/tests/qemuxml2= argvdata/disk-fmt-iso.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-fmt-iso.xml rename to tests/qemuxml2argvdata/disk-fmt-iso.xml diff --git a/tests/qemuxml2argvdata/disk-drive-fmt-qcow.args b/tests/qemuxm= l2argvdata/disk-fmt-qcow.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-fmt-qcow.args rename to tests/qemuxml2argvdata/disk-fmt-qcow.args diff --git a/tests/qemuxml2argvdata/disk-drive-fmt-qcow.xml b/tests/qemuxml= 2argvdata/disk-fmt-qcow.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-fmt-qcow.xml rename to tests/qemuxml2argvdata/disk-fmt-qcow.xml diff --git a/tests/qemuxml2argvdata/disk-ide-drive-split.args b/tests/qemux= ml2argvdata/disk-ide-split.args similarity index 100% rename from tests/qemuxml2argvdata/disk-ide-drive-split.args rename to tests/qemuxml2argvdata/disk-ide-split.args diff --git a/tests/qemuxml2argvdata/disk-ide-drive-split.xml b/tests/qemuxm= l2argvdata/disk-ide-split.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-ide-drive-split.xml rename to tests/qemuxml2argvdata/disk-ide-split.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-gluster.args b/tests= /qemuxml2argvdata/disk-network-gluster.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-gluster.args rename to tests/qemuxml2argvdata/disk-network-gluster.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-gluster.xml b/tests/= qemuxml2argvdata/disk-network-gluster.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-gluster.xml rename to tests/qemuxml2argvdata/disk-network-gluster.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi-auth-secrettyp= e-invalid.xml b/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-i= nvalid.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi-auth-secrettype= -invalid.xml rename to tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid= .xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi-auth-wrong-sec= rettype.xml b/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secretty= pe.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi-auth-wrong-secr= ettype.xml rename to tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.x= ml diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi-auth.args b/te= sts/qemuxml2argvdata/disk-network-iscsi-auth.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi-auth.args rename to tests/qemuxml2argvdata/disk-network-iscsi-auth.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi-auth.xml b/tes= ts/qemuxml2argvdata/disk-network-iscsi-auth.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi-auth.xml rename to tests/qemuxml2argvdata/disk-network-iscsi-auth.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.args b/tes= ts/qemuxml2argvdata/disk-network-iscsi-lun.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.args rename to tests/qemuxml2argvdata/disk-network-iscsi-lun.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.xml b/test= s/qemuxml2argvdata/disk-network-iscsi-lun.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.xml rename to tests/qemuxml2argvdata/disk-network-iscsi-lun.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi.args b/tests/q= emuxml2argvdata/disk-network-iscsi.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi.args rename to tests/qemuxml2argvdata/disk-network-iscsi.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi.xml b/tests/qe= muxml2argvdata/disk-network-iscsi.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi.xml rename to tests/qemuxml2argvdata/disk-network-iscsi.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-export.args b/te= sts/qemuxml2argvdata/disk-network-nbd-export.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-export.args rename to tests/qemuxml2argvdata/disk-network-nbd-export.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-export.xml b/tes= ts/qemuxml2argvdata/disk-network-nbd-export.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-export.xml rename to tests/qemuxml2argvdata/disk-network-nbd-export.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.args= b/tests/qemuxml2argvdata/disk-network-nbd-ipv6-export.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.args rename to tests/qemuxml2argvdata/disk-network-nbd-ipv6-export.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.xml = b/tests/qemuxml2argvdata/disk-network-nbd-ipv6-export.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.xml rename to tests/qemuxml2argvdata/disk-network-nbd-ipv6-export.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.args b/test= s/qemuxml2argvdata/disk-network-nbd-ipv6.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.args rename to tests/qemuxml2argvdata/disk-network-nbd-ipv6.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.xml b/tests= /qemuxml2argvdata/disk-network-nbd-ipv6.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.xml rename to tests/qemuxml2argvdata/disk-network-nbd-ipv6.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-unix.args b/test= s/qemuxml2argvdata/disk-network-nbd-unix.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-unix.args rename to tests/qemuxml2argvdata/disk-network-nbd-unix.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd-unix.xml b/tests= /qemuxml2argvdata/disk-network-nbd-unix.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd-unix.xml rename to tests/qemuxml2argvdata/disk-network-nbd-unix.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd.args b/tests/qem= uxml2argvdata/disk-network-nbd.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd.args rename to tests/qemuxml2argvdata/disk-network-nbd.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-nbd.xml b/tests/qemu= xml2argvdata/disk-network-nbd.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-nbd.xml rename to tests/qemuxml2argvdata/disk-network-nbd.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.args b/= tests/qemuxml2argvdata/disk-network-rbd-auth-AES.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.args rename to tests/qemuxml2argvdata/disk-network-rbd-auth-AES.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.xml b/t= ests/qemuxml2argvdata/disk-network-rbd-auth-AES.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.xml rename to tests/qemuxml2argvdata/disk-network-rbd-auth-AES.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-auth.args b/test= s/qemuxml2argvdata/disk-network-rbd-auth.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-auth.args rename to tests/qemuxml2argvdata/disk-network-rbd-auth.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-auth.xml b/tests= /qemuxml2argvdata/disk-network-rbd-auth.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-auth.xml rename to tests/qemuxml2argvdata/disk-network-rbd-auth.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.args b/= tests/qemuxml2argvdata/disk-network-rbd-ceph-env.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.args rename to tests/qemuxml2argvdata/disk-network-rbd-ceph-env.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.xml b/t= ests/qemuxml2argvdata/disk-network-rbd-ceph-env.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.xml rename to tests/qemuxml2argvdata/disk-network-rbd-ceph-env.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.args b/test= s/qemuxml2argvdata/disk-network-rbd-ipv6.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.args rename to tests/qemuxml2argvdata/disk-network-rbd-ipv6.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.xml b/tests= /qemuxml2argvdata/disk-network-rbd-ipv6.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.xml rename to tests/qemuxml2argvdata/disk-network-rbd-ipv6.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd-no-colon.xml b/t= ests/qemuxml2argvdata/disk-network-rbd-no-colon.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd-no-colon.xml rename to tests/qemuxml2argvdata/disk-network-rbd-no-colon.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd.args b/tests/qem= uxml2argvdata/disk-network-rbd.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd.args rename to tests/qemuxml2argvdata/disk-network-rbd.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-rbd.xml b/tests/qemu= xml2argvdata/disk-network-rbd.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-rbd.xml rename to tests/qemuxml2argvdata/disk-network-rbd.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-sheepdog.args b/test= s/qemuxml2argvdata/disk-network-sheepdog.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-sheepdog.args rename to tests/qemuxml2argvdata/disk-network-sheepdog.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-sheepdog.xml b/tests= /qemuxml2argvdata/disk-network-sheepdog.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-sheepdog.xml rename to tests/qemuxml2argvdata/disk-network-sheepdog.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-source-auth-both.xml= b/tests/qemuxml2argvdata/disk-network-source-auth-both.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-source-auth-both.xml rename to tests/qemuxml2argvdata/disk-network-source-auth-both.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-source-auth.args b/t= ests/qemuxml2argvdata/disk-network-source-auth.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-source-auth.args rename to tests/qemuxml2argvdata/disk-network-source-auth.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-source-auth.xml b/te= sts/qemuxml2argvdata/disk-network-source-auth.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-source-auth.xml rename to tests/qemuxml2argvdata/disk-network-source-auth.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args b/tests= /qemuxml2argvdata/disk-network-tlsx509.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-tlsx509.args rename to tests/qemuxml2argvdata/disk-network-tlsx509.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.xml b/tests/= qemuxml2argvdata/disk-network-tlsx509.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-tlsx509.xml rename to tests/qemuxml2argvdata/disk-network-tlsx509.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args b/tests/qe= muxml2argvdata/disk-network-vxhs.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-vxhs.args rename to tests/qemuxml2argvdata/disk-network-vxhs.args diff --git a/tests/qemuxml2argvdata/disk-drive-network-vxhs.xml b/tests/qem= uxml2argvdata/disk-network-vxhs.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-vxhs.xml rename to tests/qemuxml2argvdata/disk-network-vxhs.xml diff --git a/tests/qemuxml2argvdata/disk-drive-no-boot.args b/tests/qemuxml= 2argvdata/disk-no-boot.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-no-boot.args rename to tests/qemuxml2argvdata/disk-no-boot.args diff --git a/tests/qemuxml2argvdata/disk-drive-no-boot.xml b/tests/qemuxml2= argvdata/disk-no-boot.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-no-boot.xml rename to tests/qemuxml2argvdata/disk-no-boot.xml diff --git a/tests/qemuxml2argvdata/disk-drive-readonly-disk.args b/tests/q= emuxml2argvdata/disk-readonly-disk.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-readonly-disk.args rename to tests/qemuxml2argvdata/disk-readonly-disk.args diff --git a/tests/qemuxml2argvdata/disk-drive-readonly-disk.xml b/tests/qe= muxml2argvdata/disk-readonly-disk.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-readonly-disk.xml rename to tests/qemuxml2argvdata/disk-readonly-disk.xml diff --git a/tests/qemuxml2argvdata/disk-drive-readonly-no-device.args b/te= sts/qemuxml2argvdata/disk-readonly-no-device.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-readonly-no-device.args rename to tests/qemuxml2argvdata/disk-readonly-no-device.args diff --git a/tests/qemuxml2argvdata/disk-drive-readonly-no-device.xml b/tes= ts/qemuxml2argvdata/disk-readonly-no-device.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-readonly-no-device.xml rename to tests/qemuxml2argvdata/disk-readonly-no-device.xml diff --git a/tests/qemuxml2argvdata/disk-drive-shared-locking.args b/tests/= qemuxml2argvdata/disk-shared-locking.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-shared-locking.args rename to tests/qemuxml2argvdata/disk-shared-locking.args diff --git a/tests/qemuxml2argvdata/disk-drive-shared-locking.xml b/tests/q= emuxml2argvdata/disk-shared-locking.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-shared-locking.xml rename to tests/qemuxml2argvdata/disk-shared-locking.xml diff --git a/tests/qemuxml2argvdata/disk-drive-shared-qcow.xml b/tests/qemu= xml2argvdata/disk-shared-qcow.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-shared-qcow.xml rename to tests/qemuxml2argvdata/disk-shared-qcow.xml diff --git a/tests/qemuxml2argvdata/disk-drive-shared.args b/tests/qemuxml2= argvdata/disk-shared.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-shared.args rename to tests/qemuxml2argvdata/disk-shared.args diff --git a/tests/qemuxml2argvdata/disk-drive-shared.xml b/tests/qemuxml2a= rgvdata/disk-shared.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-shared.xml rename to tests/qemuxml2argvdata/disk-shared.xml diff --git a/tests/qemuxml2argvdata/disk-virtio-drive-queues.args b/tests/q= emuxml2argvdata/disk-virtio-queues.args similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio-drive-queues.args rename to tests/qemuxml2argvdata/disk-virtio-queues.args diff --git a/tests/qemuxml2argvdata/disk-virtio-drive-queues.xml b/tests/qe= muxml2argvdata/disk-virtio-queues.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio-drive-queues.xml rename to tests/qemuxml2argvdata/disk-virtio-queues.xml diff --git a/tests/qemuxml2argvdata/disk-drive-write-cache.x86_64-2.6.0.arg= s b/tests/qemuxml2argvdata/disk-write-cache.x86_64-2.6.0.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-write-cache.x86_64-2.6.0.args rename to tests/qemuxml2argvdata/disk-write-cache.x86_64-2.6.0.args diff --git a/tests/qemuxml2argvdata/disk-drive-write-cache.x86_64-2.7.0.arg= s b/tests/qemuxml2argvdata/disk-write-cache.x86_64-2.7.0.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-write-cache.x86_64-2.7.0.args rename to tests/qemuxml2argvdata/disk-write-cache.x86_64-2.7.0.args diff --git a/tests/qemuxml2argvdata/disk-drive-write-cache.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/disk-write-cache.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-write-cache.x86_64-latest.args rename to tests/qemuxml2argvdata/disk-write-cache.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-drive-write-cache.xml b/tests/qemu= xml2argvdata/disk-write-cache.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-write-cache.xml rename to tests/qemuxml2argvdata/disk-write-cache.xml diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 52540a6d0b..2708a58d60 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1016,65 +1016,65 @@ mymain(void) QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("disk-order", QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_VIRTIO_BLK_SCSI); - DO_TEST("disk-virtio-drive-queues", + DO_TEST("disk-virtio-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES); - DO_TEST("disk-drive-boot-disk", + DO_TEST("disk-boot-disk", QEMU_CAPS_DRIVE_BOOT); - DO_TEST("disk-drive-boot-cdrom", + DO_TEST("disk-boot-cdrom", QEMU_CAPS_DRIVE_BOOT); DO_TEST("floppy-drive-fat", QEMU_CAPS_DRIVE_BOOT); - DO_TEST("disk-drive-readonly-disk", NONE); - DO_TEST("disk-drive-readonly-no-device", NONE); - DO_TEST("disk-drive-fmt-qcow", + DO_TEST("disk-readonly-disk", NONE); + DO_TEST("disk-readonly-no-device", NONE); + DO_TEST("disk-fmt-qcow", QEMU_CAPS_DRIVE_BOOT); - DO_TEST_PARSE_ERROR("disk-drive-fmt-cow", QEMU_CAPS_DRIVE_BOOT); - DO_TEST_PARSE_ERROR("disk-drive-fmt-dir", QEMU_CAPS_DRIVE_BOOT); - DO_TEST_PARSE_ERROR("disk-drive-fmt-iso", QEMU_CAPS_DRIVE_BOOT); - DO_TEST("disk-drive-shared", NONE); - DO_TEST_PARSE_ERROR("disk-drive-shared-qcow", NONE); - DO_TEST("disk-drive-shared-locking", + DO_TEST_PARSE_ERROR("disk-fmt-cow", QEMU_CAPS_DRIVE_BOOT); + DO_TEST_PARSE_ERROR("disk-fmt-dir", QEMU_CAPS_DRIVE_BOOT); + DO_TEST_PARSE_ERROR("disk-fmt-iso", QEMU_CAPS_DRIVE_BOOT); + DO_TEST("disk-shared", NONE); + DO_TEST_PARSE_ERROR("disk-shared-qcow", NONE); + DO_TEST("disk-shared-locking", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DISK_SHARE_RW); - DO_TEST("disk-drive-error-policy", NONE); - DO_TEST_CAPS_LATEST("disk-drive-error-policy"); - DO_TEST("disk-drive-cache-v2-wt", NONE); - DO_TEST("disk-drive-cache-v2-wb", NONE); - DO_TEST("disk-drive-cache-v2-none", NONE); - DO_TEST("disk-drive-cache-directsync", NONE); - DO_TEST("disk-drive-cache-unsafe", NONE); - DO_TEST_CAPS_VER("disk-drive-write-cache", "2.6.0"); - DO_TEST_CAPS_VER("disk-drive-write-cache", "2.7.0"); - DO_TEST_CAPS_LATEST("disk-drive-write-cache"); - DO_TEST("disk-drive-network-nbd", NONE); - DO_TEST("disk-drive-network-nbd-export", NONE); - DO_TEST("disk-drive-network-nbd-ipv6", NONE); - DO_TEST("disk-drive-network-nbd-ipv6-export", NONE); - DO_TEST("disk-drive-network-nbd-unix", NONE); - DO_TEST("disk-drive-network-iscsi", NONE); - DO_TEST("disk-drive-network-iscsi-auth", NONE); - DO_TEST_PARSE_ERROR("disk-drive-network-iscsi-auth-secrettype-invalid"= , NONE); - DO_TEST_PARSE_ERROR("disk-drive-network-iscsi-auth-wrong-secrettype", = NONE); - DO_TEST_PARSE_ERROR("disk-drive-network-source-auth-both", NONE); - DO_TEST("disk-drive-network-iscsi-lun", + DO_TEST("disk-error-policy", NONE); + DO_TEST_CAPS_LATEST("disk-error-policy"); + DO_TEST("disk-cache-v2-wt", NONE); + DO_TEST("disk-cache-v2-wb", NONE); + DO_TEST("disk-cache-v2-none", NONE); + DO_TEST("disk-cache-directsync", NONE); + DO_TEST("disk-cache-unsafe", NONE); + DO_TEST_CAPS_VER("disk-write-cache", "2.6.0"); + DO_TEST_CAPS_VER("disk-write-cache", "2.7.0"); + DO_TEST_CAPS_LATEST("disk-write-cache"); + DO_TEST("disk-network-nbd", NONE); + DO_TEST("disk-network-nbd-export", NONE); + DO_TEST("disk-network-nbd-ipv6", NONE); + DO_TEST("disk-network-nbd-ipv6-export", NONE); + DO_TEST("disk-network-nbd-unix", NONE); + DO_TEST("disk-network-iscsi", NONE); + DO_TEST("disk-network-iscsi-auth", NONE); + DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid", NONE= ); + DO_TEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype", NONE); + DO_TEST_PARSE_ERROR("disk-network-source-auth-both", NONE); + DO_TEST("disk-network-iscsi-lun", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_BLOCK); - DO_TEST("disk-drive-network-gluster", + DO_TEST("disk-network-gluster", QEMU_CAPS_GLUSTER_DEBUG_LEVEL); - DO_TEST("disk-drive-network-rbd", NONE); - DO_TEST("disk-drive-network-sheepdog", NONE); - DO_TEST("disk-drive-network-rbd-auth", NONE); - DO_TEST("disk-drive-network-source-auth", NONE); - DO_TEST("disk-drive-network-rbd-auth-AES", + DO_TEST("disk-network-rbd", NONE); + DO_TEST("disk-network-sheepdog", NONE); + DO_TEST("disk-network-rbd-auth", NONE); + DO_TEST("disk-network-source-auth", NONE); + DO_TEST("disk-network-rbd-auth-AES", QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("disk-drive-network-rbd-ipv6", NONE); - DO_TEST_FAILURE("disk-drive-network-rbd-no-colon", NONE); - DO_TEST("disk-drive-network-vxhs", QEMU_CAPS_VXHS); + DO_TEST("disk-network-rbd-ipv6", NONE); + DO_TEST_FAILURE("disk-network-rbd-no-colon", NONE); + DO_TEST("disk-network-vxhs", QEMU_CAPS_VXHS); driver.config->vxhsTLS =3D 1; - DO_TEST("disk-drive-network-tlsx509", QEMU_CAPS_VXHS, + DO_TEST("disk-network-tlsx509", QEMU_CAPS_VXHS, QEMU_CAPS_OBJECT_TLS_CREDS_X509, QEMU_CAPS_NBD_TLS); driver.config->vxhsTLS =3D 0; VIR_FREE(driver.config->vxhsTLSx509certdir); - DO_TEST("disk-drive-no-boot", + DO_TEST("disk-no-boot", QEMU_CAPS_BOOTINDEX); DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid", QEMU_CAPS_VIRTIO_SCSI); @@ -1129,16 +1129,16 @@ mymain(void) DO_TEST("disk-copy_on_read", QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_VIRTIO_BLK_SCSI); - DO_TEST("disk-drive-discard", + DO_TEST("disk-discard", QEMU_CAPS_DRIVE_DISCARD); - DO_TEST("disk-drive-detect-zeroes", + DO_TEST("disk-detect-zeroes", QEMU_CAPS_DRIVE_DISCARD, QEMU_CAPS_DRIVE_DETECT_ZEROES); DO_TEST("disk-snapshot", NONE); DO_TEST_PARSE_ERROR("disk-same-targets", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_DEVICE_USB_STORAGE); - DO_TEST_PARSE_ERROR("disk-drive-address-conflict", + DO_TEST_PARSE_ERROR("disk-address-conflict", QEMU_CAPS_ICH9_AHCI); DO_TEST_PARSE_ERROR("disk-hostdev-scsi-address-conflict", QEMU_CAPS_VIRTIO_SCSI, @@ -1927,7 +1927,7 @@ mymain(void) DO_TEST("mach-virt-console-virtio", NONE); DO_TEST_PARSE_ERROR("mach-virt-serial-invalid-machine", NONE); - DO_TEST("disk-ide-drive-split", + DO_TEST("disk-ide-split", QEMU_CAPS_IDE_CD); DO_TEST("disk-ide-wwn", QEMU_CAPS_IDE_CD, diff --git a/tests/qemuxml2xmloutdata/disk-drive-boot-cdrom.xml b/tests/qem= uxml2xmloutdata/disk-boot-cdrom.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-boot-cdrom.xml rename to tests/qemuxml2xmloutdata/disk-boot-cdrom.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-boot-disk.xml b/tests/qemu= xml2xmloutdata/disk-boot-disk.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-boot-disk.xml rename to tests/qemuxml2xmloutdata/disk-boot-disk.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-cache-directsync.xml b/tes= ts/qemuxml2xmloutdata/disk-cache-directsync.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-cache-directsync.xml rename to tests/qemuxml2xmloutdata/disk-cache-directsync.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-cache-unsafe.xml b/tests/q= emuxml2xmloutdata/disk-cache-unsafe.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-cache-unsafe.xml rename to tests/qemuxml2xmloutdata/disk-cache-unsafe.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-cache-v2-none.xml b/tests/= qemuxml2xmloutdata/disk-cache-v2-none.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-cache-v2-none.xml rename to tests/qemuxml2xmloutdata/disk-cache-v2-none.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml b/tests/qe= muxml2xmloutdata/disk-cache-v2-wb.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml rename to tests/qemuxml2xmloutdata/disk-cache-v2-wb.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml b/tests/qe= muxml2xmloutdata/disk-cache-v2-wt.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml rename to tests/qemuxml2xmloutdata/disk-cache-v2-wt.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml b/tests/q= emuxml2xmloutdata/disk-copy-on-read.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml rename to tests/qemuxml2xmloutdata/disk-copy-on-read.xml diff --git a/tests/qemuxml2xmloutdata/disk-detect-zeroes.xml b/tests/qemuxm= l2xmloutdata/disk-detect-zeroes.xml new file mode 120000 index 0000000000..17a520c4d4 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-detect-zeroes.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/disk-detect-zeroes.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/disk-drive-discard.xml b/tests/qemuxm= l2xmloutdata/disk-discard.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-discard.xml rename to tests/qemuxml2xmloutdata/disk-discard.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml b/tests/= qemuxml2xmloutdata/disk-drive-detect-zeroes.xml deleted file mode 120000 index 54af6627d6..0000000000 --- a/tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/disk-drive-detect-zeroes.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/disk-drive-error-policy.xml b/tests/q= emuxml2xmloutdata/disk-error-policy.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-error-policy.xml rename to tests/qemuxml2xmloutdata/disk-error-policy.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-fat.xml b/tests/qemuxml2xm= loutdata/disk-fat.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-fat.xml rename to tests/qemuxml2xmloutdata/disk-fat.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-fmt-qcow.xml b/tests/qemux= ml2xmloutdata/disk-fmt-qcow.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-fmt-qcow.xml rename to tests/qemuxml2xmloutdata/disk-fmt-qcow.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-gluster.xml b/test= s/qemuxml2xmloutdata/disk-network-gluster.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-gluster.xml rename to tests/qemuxml2xmloutdata/disk-network-gluster.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-iscsi-auth.xml b/t= ests/qemuxml2xmloutdata/disk-network-iscsi-auth.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-iscsi-auth.xml rename to tests/qemuxml2xmloutdata/disk-network-iscsi-auth.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-iscsi.xml b/tests/= qemuxml2xmloutdata/disk-network-iscsi.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-iscsi.xml rename to tests/qemuxml2xmloutdata/disk-network-iscsi.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-nbd-export.xml b/t= ests/qemuxml2xmloutdata/disk-network-nbd-export.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-nbd-export.xml rename to tests/qemuxml2xmloutdata/disk-network-nbd-export.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6-export.xm= l b/tests/qemuxml2xmloutdata/disk-network-nbd-ipv6-export.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6-export.xml rename to tests/qemuxml2xmloutdata/disk-network-nbd-ipv6-export.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6.xml b/tes= ts/qemuxml2xmloutdata/disk-network-nbd-ipv6.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6.xml rename to tests/qemuxml2xmloutdata/disk-network-nbd-ipv6.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-nbd-unix.xml b/tes= ts/qemuxml2xmloutdata/disk-network-nbd-unix.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-nbd-unix.xml rename to tests/qemuxml2xmloutdata/disk-network-nbd-unix.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-nbd.xml b/tests/qe= muxml2xmloutdata/disk-network-nbd.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-nbd.xml rename to tests/qemuxml2xmloutdata/disk-network-nbd.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-rbd-auth.xml b/tes= ts/qemuxml2xmloutdata/disk-network-rbd-auth.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-rbd-auth.xml rename to tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-rbd-ceph-env.xml b= /tests/qemuxml2xmloutdata/disk-network-rbd-ceph-env.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-rbd-ceph-env.xml rename to tests/qemuxml2xmloutdata/disk-network-rbd-ceph-env.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-rbd-ipv6.xml b/tes= ts/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-rbd-ipv6.xml rename to tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-rbd.xml b/tests/qe= muxml2xmloutdata/disk-network-rbd.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-rbd.xml rename to tests/qemuxml2xmloutdata/disk-network-rbd.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-sheepdog.xml b/tes= ts/qemuxml2xmloutdata/disk-network-sheepdog.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-sheepdog.xml rename to tests/qemuxml2xmloutdata/disk-network-sheepdog.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-source-auth.xml b/= tests/qemuxml2xmloutdata/disk-network-source-auth.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-source-auth.xml rename to tests/qemuxml2xmloutdata/disk-network-source-auth.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-tlsx509.xml b/test= s/qemuxml2xmloutdata/disk-network-tlsx509.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-tlsx509.xml rename to tests/qemuxml2xmloutdata/disk-network-tlsx509.xml diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-vxhs.xml b/tests/q= emuxml2xmloutdata/disk-network-vxhs.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-drive-network-vxhs.xml rename to tests/qemuxml2xmloutdata/disk-network-vxhs.xml diff --git a/tests/qemuxml2xmloutdata/disk-virtio-drive-queues.xml b/tests/= qemuxml2xmloutdata/disk-virtio-queues.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-virtio-drive-queues.xml rename to tests/qemuxml2xmloutdata/disk-virtio-queues.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 5e4adc99ed..0373117f06 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -353,33 +353,33 @@ mymain(void) DO_TEST("disk-usb-device", NONE); DO_TEST("disk-virtio", NONE); DO_TEST("floppy-drive-fat", NONE); - DO_TEST("disk-virtio-drive-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES); - DO_TEST("disk-drive-boot-disk", NONE); - DO_TEST("disk-drive-boot-cdrom", NONE); - DO_TEST("disk-drive-error-policy", NONE); - DO_TEST("disk-drive-fmt-qcow", NONE); - DO_TEST("disk-drive-copy-on-read", NONE); - DO_TEST("disk-drive-cache-v2-wt", NONE); - DO_TEST("disk-drive-cache-v2-wb", NONE); - DO_TEST("disk-drive-cache-v2-none", NONE); - DO_TEST("disk-drive-cache-directsync", NONE); - DO_TEST("disk-drive-cache-unsafe", NONE); - DO_TEST("disk-drive-network-nbd", NONE); - DO_TEST("disk-drive-network-nbd-export", NONE); - DO_TEST("disk-drive-network-nbd-ipv6", NONE); - DO_TEST("disk-drive-network-nbd-ipv6-export", NONE); - DO_TEST("disk-drive-network-nbd-unix", NONE); - DO_TEST("disk-drive-network-iscsi", NONE); - DO_TEST("disk-drive-network-iscsi-auth", NONE); - DO_TEST("disk-drive-network-gluster", NONE); - DO_TEST("disk-drive-network-rbd", NONE); - DO_TEST("disk-drive-network-rbd-auth", NONE); - DO_TEST("disk-drive-network-rbd-ipv6", NONE); - DO_TEST("disk-drive-network-rbd-ceph-env", NONE); - DO_TEST("disk-drive-network-source-auth", NONE); - DO_TEST("disk-drive-network-sheepdog", NONE); - DO_TEST("disk-drive-network-vxhs", NONE); - DO_TEST("disk-drive-network-tlsx509", NONE); + DO_TEST("disk-virtio-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES); + DO_TEST("disk-boot-disk", NONE); + DO_TEST("disk-boot-cdrom", NONE); + DO_TEST("disk-error-policy", NONE); + DO_TEST("disk-fmt-qcow", NONE); + DO_TEST("disk-copy-on-read", NONE); + DO_TEST("disk-cache-v2-wt", NONE); + DO_TEST("disk-cache-v2-wb", NONE); + DO_TEST("disk-cache-v2-none", NONE); + DO_TEST("disk-cache-directsync", NONE); + DO_TEST("disk-cache-unsafe", NONE); + DO_TEST("disk-network-nbd", NONE); + DO_TEST("disk-network-nbd-export", NONE); + DO_TEST("disk-network-nbd-ipv6", NONE); + DO_TEST("disk-network-nbd-ipv6-export", NONE); + DO_TEST("disk-network-nbd-unix", NONE); + DO_TEST("disk-network-iscsi", NONE); + DO_TEST("disk-network-iscsi-auth", NONE); + DO_TEST("disk-network-gluster", NONE); + DO_TEST("disk-network-rbd", NONE); + DO_TEST("disk-network-rbd-auth", NONE); + DO_TEST("disk-network-rbd-ipv6", NONE); + DO_TEST("disk-network-rbd-ceph-env", NONE); + DO_TEST("disk-network-source-auth", NONE); + DO_TEST("disk-network-sheepdog", NONE); + DO_TEST("disk-network-vxhs", NONE); + DO_TEST("disk-network-tlsx509", NONE); DO_TEST("disk-scsi-device", QEMU_CAPS_SCSI_LSI); DO_TEST("disk-scsi-vscsi", NONE); @@ -572,8 +572,8 @@ mymain(void) DO_TEST("disk-source-pool", NONE); DO_TEST("disk-source-pool-mode", NONE); - DO_TEST("disk-drive-discard", NONE); - DO_TEST("disk-drive-detect-zeroes", NONE); + DO_TEST("disk-discard", NONE); + DO_TEST("disk-detect-zeroes", NONE); DO_TEST("disk-serial", NONE); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list