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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/tests/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-error-policy.x86_64-latest.args rename to tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-drive-error-policy.xml b/tests/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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-secrettype-invalid.xml b/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.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-secrettype.xml b/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-drive-network-iscsi-auth-wrong-secrettype.xml rename to tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.xml diff --git a/tests/qemuxml2argvdata/disk-drive-network-iscsi-auth.args b/tests/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/tests/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/tests/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/tests/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/qemuxml2argvdata/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/qemuxml2argvdata/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/tests/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/tests/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/tests/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/tests/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/qemuxml2argvdata/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/qemuxml2argvdata/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/tests/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/tests/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/tests/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/tests/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/tests/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/qemuxml2argvdata/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/qemuxml2argvdata/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/tests/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/tests/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/tests/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/tests/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/tests/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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/qemuxml2argvdata/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.args 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.args 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.args 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/qemuxml2argvdata/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 52540a6d0b8c1f88daa4d5ad3d078c8b116c61f3..2708a58d60b0f978b5fd4836089011d5f66642e4 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 = 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 = 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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/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/tests/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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/disk-detect-zeroes.xml new file mode 120000 index 0000000000000000000000000000000000000000..17a520c4d4e170e9acb577cf0847a836f7cb4228 --- /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/qemuxml2xmloutdata/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 54af6627d63b27663ce6c09a2dad2d23b18f2f8c..0000000000000000000000000000000000000000 --- 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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/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/qemuxml2xmloutdata/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/tests/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/tests/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/tests/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.xml 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/tests/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/tests/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/qemuxml2xmloutdata/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/tests/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/tests/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/qemuxml2xmloutdata/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/tests/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/tests/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/qemuxml2xmloutdata/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 5e4adc99ed9acc31f55eb931eeb0750f5c761f30..0373117f06b4fe9b07c891ac641e242d8af94374 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);