[pve-devel] [PATCH qemu-server 06/10] tests: scripted: update tests to new vtypes and paths

Wolfgang Bumiller
2025-07-29T12:41:33Z

This is the result of:

$ find src/test/ -type f -print0 | xargs -0 sed -ri -e 's/\<vm-[0-9]+-disk-/vol-&/g'
$ find src/test/ -type f -print0 | xargs -0 sed -ri -e 's/\<vm-\$vmid-disk-/vol-&/g'
$ find src/test/ -type f -print0 | xargs -0 sed -ri -e 's/snap_(vm-\$vmid-disk-)/snap_vol-\1/g'
$ find src/test/ -type f -print0 | xargs -0 sed -ri -e 's/snap_(vm-[0-9]+-disk-)/snap_vol-\1/g'
$ find src/test/ -type f -print0 | xargs -0 sed -ri -e 's|/images/([0-9]+/vol-vm)|/vms/\1|g'
$ find src/test/ -type f -print0 | xargs -0 sed -ri -e 's|/images/([0-9]+/vol-ct)|/cts/\1|g'
$ find src/test/ -type f -print0 | xargs -0 sed -ri -e 's|/images/(\$vmid/vol-vm)|/vms/\1|g'
$ find src/test/ -type f -print0 | xargs -0 sed -ri -e 's|/images/(\$vmid/vol-ct)|/cts/\1|g'

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
src/test/cfg2cmd/aio.conf | 28 +--
src/test/cfg2cmd/aio.conf.cmd | 28 +--
src/test/cfg2cmd/bootorder-empty.conf | 6 +-
src/test/cfg2cmd/bootorder-empty.conf.cmd | 6 +-
src/test/cfg2cmd/bootorder-legacy.conf | 6 +-
src/test/cfg2cmd/bootorder-legacy.conf.cmd | 6 +-
src/test/cfg2cmd/bootorder.conf | 6 +-
src/test/cfg2cmd/bootorder.conf.cmd | 6 +-
src/test/cfg2cmd/efi-raw-old.conf | 2 +-
src/test/cfg2cmd/efi-raw-old.conf.cmd | 2 +-
src/test/cfg2cmd/efi-raw.conf | 2 +-
src/test/cfg2cmd/efi-raw.conf.cmd | 2 +-
src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf | 4 +-
.../cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd | 2 +-
src/test/cfg2cmd/efi-secboot-and-tpm.conf | 4 +-
src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd | 2 +-
src/test/cfg2cmd/efidisk-on-rbd.conf | 2 +-
src/test/cfg2cmd/efidisk-on-rbd.conf.cmd | 2 +-
src/test/cfg2cmd/i440fx-win10-hostpci.conf | 2 +-
.../cfg2cmd/i440fx-win10-hostpci.conf.cmd | 2 +-
src/test/cfg2cmd/ide-no-media-error.conf | 2 +-
src/test/cfg2cmd/ide.conf | 2 +-
src/test/cfg2cmd/ide.conf.cmd | 2 +-
src/test/cfg2cmd/pinned-version-pxe-pve.conf | 2 +-
.../cfg2cmd/pinned-version-pxe-pve.conf.cmd | 2 +-
src/test/cfg2cmd/pinned-version-pxe.conf | 2 +-
src/test/cfg2cmd/pinned-version-pxe.conf.cmd | 2 +-
src/test/cfg2cmd/pinned-version.conf | 2 +-
src/test/cfg2cmd/pinned-version.conf.cmd | 2 +-
src/test/cfg2cmd/q35-ide.conf | 2 +-
src/test/cfg2cmd/q35-ide.conf.cmd | 2 +-
.../cfg2cmd/q35-linux-hostpci-mapping.conf | 2 +-
.../q35-linux-hostpci-mapping.conf.cmd | 2 +-
.../q35-linux-hostpci-multifunction.conf | 2 +-
.../q35-linux-hostpci-multifunction.conf.cmd | 2 +-
.../q35-linux-hostpci-x-pci-overrides.conf | 2 +-
...q35-linux-hostpci-x-pci-overrides.conf.cmd | 2 +-
src/test/cfg2cmd/q35-linux-hostpci.conf | 2 +-
src/test/cfg2cmd/q35-linux-hostpci.conf.cmd | 2 +-
src/test/cfg2cmd/q35-simple-6.0.conf | 2 +-
src/test/cfg2cmd/q35-simple-6.0.conf.cmd | 2 +-
src/test/cfg2cmd/q35-simple-7.0.conf | 2 +-
src/test/cfg2cmd/q35-simple-7.0.conf.cmd | 2 +-
src/test/cfg2cmd/q35-simple-pinned-6.1.conf | 2 +-
.../cfg2cmd/q35-simple-pinned-6.1.conf.cmd | 2 +-
src/test/cfg2cmd/q35-simple.conf | 2 +-
src/test/cfg2cmd/q35-simple.conf.cmd | 2 +-
src/test/cfg2cmd/q35-win10-hostpci.conf | 2 +-
src/test/cfg2cmd/q35-win10-hostpci.conf.cmd | 2 +-
src/test/cfg2cmd/seabios_serial.conf | 2 +-
src/test/cfg2cmd/seabios_serial.conf.cmd | 2 +-
src/test/cfg2cmd/sev-es.conf | 2 +-
src/test/cfg2cmd/sev-es.conf.cmd | 2 +-
src/test/cfg2cmd/sev-std.conf | 2 +-
src/test/cfg2cmd/sev-std.conf.cmd | 2 +-
src/test/cfg2cmd/simple-backingchain.conf | 16 +-
src/test/cfg2cmd/simple-backingchain.conf.cmd | 4 +-
.../simple-balloon-free-page-reporting.conf | 2 +-
...imple-balloon-free-page-reporting.conf.cmd | 2 +-
src/test/cfg2cmd/simple-btrfs.conf | 8 +-
src/test/cfg2cmd/simple-btrfs.conf.cmd | 8 +-
src/test/cfg2cmd/simple-cifs.conf | 8 +-
src/test/cfg2cmd/simple-cifs.conf.cmd | 8 +-
src/test/cfg2cmd/simple-lvm.conf | 8 +-
src/test/cfg2cmd/simple-lvm.conf.cmd | 8 +-
src/test/cfg2cmd/simple-lvmthin.conf | 8 +-
src/test/cfg2cmd/simple-lvmthin.conf.cmd | 8 +-
src/test/cfg2cmd/simple-rbd.conf | 16 +-
src/test/cfg2cmd/simple-rbd.conf.cmd | 16 +-
src/test/cfg2cmd/simple-virtio-blk.conf | 2 +-
src/test/cfg2cmd/simple-virtio-blk.conf.cmd | 2 +-
src/test/cfg2cmd/simple-zfs-over-iscsi.conf | 8 +-
src/test/cfg2cmd/simple1.conf | 2 +-
src/test/cfg2cmd/simple1.conf.cmd | 2 +-
.../unsupported-storage-content-type.conf | 2 +-
.../cloudinit-snapshot.conf | 6 +-
.../duplicate-sections.conf | 6 +-
.../unknown-sections.conf | 6 +-
.../verify-snapshot.conf | 6 +-
.../cloudinit-snapshot.conf | 6 +-
.../duplicate-sections.conf | 8 +-
.../parse-config-input/fleecing-section.conf | 4 +-
src/test/parse-config-input/locked.conf | 4 +-
src/test/parse-config-input/plain.conf | 2 +-
.../parse-config-input/regular-vm-efi.conf | 4 +-
src/test/parse-config-input/sections.conf | 6 +-
src/test/parse-config-input/snapshots.conf | 56 ++---
.../parse-config-input/unknown-sections.conf | 6 +-
.../parse-config-input/verify-snapshot.conf | 6 +-
src/test/restore-config-expected/139.conf | 4 +-
src/test/restore-config-expected/142.conf | 2 +-
src/test/restore-config-expected/1422.conf | 2 +-
src/test/restore-config-expected/179.conf | 10 +-
src/test/restore-config-input/139.conf | 4 +-
src/test/restore-config-input/142.conf | 2 +-
src/test/restore-config-input/1422.conf | 4 +-
src/test/restore-config-input/179.conf | 10 +-
src/test/run_config2command_tests.pl | 12 +-
src/test/run_qemu_img_convert_tests.pl | 160 +++++++-------
src/test/run_qemu_migrate_tests.pl | 204 +++++++++---------
src/test/test_get_replicatable_volumes.pl | 40 ++--
101 files changed, 454 insertions(+), 454 deletions(-)

diff --git a/src/test/cfg2cmd/aio.conf b/src/test/cfg2cmd/aio.conf
index d83c23d7..b4b57038 100644
--- a/src/test/cfg2cmd/aio.conf
+++ b/src/test/cfg2cmd/aio.conf
@@ -1,14 +1,14 @@
-scsi0: local:8006/vm-8006-disk-0.raw,discard=on,size=104858K,aio=threads
-scsi1: local:8006/vm-8006-disk-1.raw,discard=on,size=104858K,aio=native
-scsi2: local:8006/vm-8006-disk-2.raw,discard=on,size=104858K,aio=io_uring
-scsi3: local:8006/vm-8006-disk-3.raw,discard=on,size=104858K
-scsi4: cifs-store:8006/vm-8006-disk-4.raw,discard=on,size=104858K
-scsi5: cifs-store:8006/vm-8006-disk-5.raw,discard=on,size=104858K,aio=io_uring
-scsi6: krbd-store:vm-8006-disk-6,discard=on,size=104858K
-scsi7: krbd-store:vm-8006-disk-7,discard=on,size=104858K,aio=io_uring
-scsi8: krbd-store:vm-8006-disk-8,discard=on,size=104858K,cache=writeback
-scsi9: krbd-store:vm-8006-disk-9,discard=on,size=104858K,cache=writeback,aio=io_uring
-scsi10: rbd-store:vm-8006-disk-8,discard=on,size=104858K
-scsi11: rbd-store:vm-8006-disk-8,discard=on,size=104858K,aio=io_uring
-scsi12: lvm-store:vm-8006-disk-9,discard=on,size=104858K
-scsi13: lvm-store:vm-8006-disk-9,discard=on,size=104858K,aio=io_uring
+scsi0: local:8006/vol-vm-8006-disk-0.raw,discard=on,size=104858K,aio=threads
+scsi1: local:8006/vol-vm-8006-disk-1.raw,discard=on,size=104858K,aio=native
+scsi2: local:8006/vol-vm-8006-disk-2.raw,discard=on,size=104858K,aio=io_uring
+scsi3: local:8006/vol-vm-8006-disk-3.raw,discard=on,size=104858K
+scsi4: cifs-store:8006/vol-vm-8006-disk-4.raw,discard=on,size=104858K
+scsi5: cifs-store:8006/vol-vm-8006-disk-5.raw,discard=on,size=104858K,aio=io_uring
+scsi6: krbd-store:vol-vm-8006-disk-6,discard=on,size=104858K
+scsi7: krbd-store:vol-vm-8006-disk-7,discard=on,size=104858K,aio=io_uring
+scsi8: krbd-store:vol-vm-8006-disk-8,discard=on,size=104858K,cache=writeback
+scsi9: krbd-store:vol-vm-8006-disk-9,discard=on,size=104858K,cache=writeback,aio=io_uring
+scsi10: rbd-store:vol-vm-8006-disk-8,discard=on,size=104858K
+scsi11: rbd-store:vol-vm-8006-disk-8,discard=on,size=104858K,aio=io_uring
+scsi12: lvm-store:vol-vm-8006-disk-9,discard=on,size=104858K
+scsi13: lvm-store:vol-vm-8006-disk-9,discard=on,size=104858K,aio=io_uring
diff --git a/src/test/cfg2cmd/aio.conf.cmd b/src/test/cfg2cmd/aio.conf.cmd
index fbeccc9f..7544b1db 100644
--- a/src/test/cfg2cmd/aio.conf.cmd
+++ b/src/test/cfg2cmd/aio.conf.cmd
@@ -38,33 +38,33 @@
-device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-device 'lsi,id=scsihw0,bus=pci.0,addr=0x5' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.raw","node-name":"e3b2553803d55d43b9986a0aac3e9a7","read-only":false},"node-name":"f3b2553803d55d43b9986a0aac3e9a7","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-0.raw","node-name":"e3b2553803d55d43b9986a0aac3e9a7","read-only":false},"node-name":"f3b2553803d55d43b9986a0aac3e9a7","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
-device 'scsi-hd,bus=scsihw0.0,scsi-id=0,drive=drive-scsi0,id=scsi0,device_id=drive-scsi0,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-1.raw","node-name":"e08707d013893852b3d4d42301a4298","read-only":false},"node-name":"f08707d013893852b3d4d42301a4298","read-only":false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-1.raw","node-name":"e08707d013893852b3d4d42301a4298","read-only":false},"node-name":"f08707d013893852b3d4d42301a4298","read-only":false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \
-device 'scsi-hd,bus=scsihw0.0,scsi-id=1,drive=drive-scsi1,id=scsi1,device_id=drive-scsi1,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-2.raw","node-name":"edb0854bba55e8b2544ad937c9f5afc","read-only":false},"node-name":"fdb0854bba55e8b2544ad937c9f5afc","read-only":false},"node-name":"drive-scsi2","read-only":false,"throttle-group":"throttle-drive-scsi2"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-2.raw","node-name":"edb0854bba55e8b2544ad937c9f5afc","read-only":false},"node-name":"fdb0854bba55e8b2544ad937c9f5afc","read-only":false},"node-name":"drive-scsi2","read-only":false,"throttle-group":"throttle-drive-scsi2"}' \
-device 'scsi-hd,bus=scsihw0.0,scsi-id=2,drive=drive-scsi2,id=scsi2,device_id=drive-scsi2,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-3.raw","node-name":"e9c170cb9491763cad3f31718205efc","read-only":false},"node-name":"f9c170cb9491763cad3f31718205efc","read-only":false},"node-name":"drive-scsi3","read-only":false,"throttle-group":"throttle-drive-scsi3"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-3.raw","node-name":"e9c170cb9491763cad3f31718205efc","read-only":false},"node-name":"f9c170cb9491763cad3f31718205efc","read-only":false},"node-name":"drive-scsi3","read-only":false,"throttle-group":"throttle-drive-scsi3"}' \
-device 'scsi-hd,bus=scsihw0.0,scsi-id=3,drive=drive-scsi3,id=scsi3,device_id=drive-scsi3,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/mnt/pve/cifs-store/images/8006/vm-8006-disk-4.raw","node-name":"ea34ecc24c40da0d53420ef344ced37","read-only":false},"node-name":"fa34ecc24c40da0d53420ef344ced37","read-only":false},"node-name":"drive-scsi4","read-only":false,"throttle-group":"throttle-drive-scsi4"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/mnt/pve/cifs-store/vms/8006/vol-vm-8006-disk-4.raw","node-name":"ea34ecc24c40da0d53420ef344ced37","read-only":false},"node-name":"fa34ecc24c40da0d53420ef344ced37","read-only":false},"node-name":"drive-scsi4","read-only":false,"throttle-group":"throttle-drive-scsi4"}' \
-device 'scsi-hd,bus=scsihw0.0,scsi-id=4,drive=drive-scsi4,id=scsi4,device_id=drive-scsi4,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/mnt/pve/cifs-store/images/8006/vm-8006-disk-5.raw","node-name":"e39cacf47a4f4877072601505d90949","read-only":false},"node-name":"f39cacf47a4f4877072601505d90949","read-only":false},"node-name":"drive-scsi5","read-only":false,"throttle-group":"throttle-drive-scsi5"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/mnt/pve/cifs-store/vms/8006/vol-vm-8006-disk-5.raw","node-name":"e39cacf47a4f4877072601505d90949","read-only":false},"node-name":"f39cacf47a4f4877072601505d90949","read-only":false},"node-name":"drive-scsi5","read-only":false,"throttle-group":"throttle-drive-scsi5"}' \
-device 'scsi-hd,bus=scsihw0.0,scsi-id=5,drive=drive-scsi5,id=scsi5,device_id=drive-scsi5,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vm-8006-disk-6","node-name":"e7db1ee70981087e4a2861bc7da417b","read-only":false},"node-name":"f7db1ee70981087e4a2861bc7da417b","read-only":false},"node-name":"drive-scsi6","read-only":false,"throttle-group":"throttle-drive-scsi6"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vol-vm-8006-disk-6","node-name":"e7db1ee70981087e4a2861bc7da417b","read-only":false},"node-name":"f7db1ee70981087e4a2861bc7da417b","read-only":false},"node-name":"drive-scsi6","read-only":false,"throttle-group":"throttle-drive-scsi6"}' \
-device 'scsi-hd,bus=scsihw0.0,scsi-id=6,drive=drive-scsi6,id=scsi6,device_id=drive-scsi6,write-cache=on' \
-device 'lsi,id=scsihw1,bus=pci.0,addr=0x6' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vm-8006-disk-7","node-name":"e2d2deac808301140a96c862fe3ea85","read-only":false},"node-name":"f2d2deac808301140a96c862fe3ea85","read-only":false},"node-name":"drive-scsi7","read-only":false,"throttle-group":"throttle-drive-scsi7"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vol-vm-8006-disk-7","node-name":"e2d2deac808301140a96c862fe3ea85","read-only":false},"node-name":"f2d2deac808301140a96c862fe3ea85","read-only":false},"node-name":"drive-scsi7","read-only":false,"throttle-group":"throttle-drive-scsi7"}' \
-device 'scsi-hd,bus=scsihw1.0,scsi-id=0,drive=drive-scsi7,id=scsi7,device_id=drive-scsi7,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vm-8006-disk-8","node-name":"e9796b73db57b8943746ede7d0d3060","read-only":false},"node-name":"f9796b73db57b8943746ede7d0d3060","read-only":false},"node-name":"drive-scsi8","read-only":false,"throttle-group":"throttle-drive-scsi8"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vol-vm-8006-disk-8","node-name":"e9796b73db57b8943746ede7d0d3060","read-only":false},"node-name":"f9796b73db57b8943746ede7d0d3060","read-only":false},"node-name":"drive-scsi8","read-only":false,"throttle-group":"throttle-drive-scsi8"}' \
-device 'scsi-hd,bus=scsihw1.0,scsi-id=1,drive=drive-scsi8,id=scsi8,device_id=drive-scsi8,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vm-8006-disk-9","node-name":"efa538892acc012edbdc5810035bf7d","read-only":false},"node-name":"ffa538892acc012edbdc5810035bf7d","read-only":false},"node-name":"drive-scsi9","read-only":false,"throttle-group":"throttle-drive-scsi9"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vol-vm-8006-disk-9","node-name":"efa538892acc012edbdc5810035bf7d","read-only":false},"node-name":"ffa538892acc012edbdc5810035bf7d","read-only":false},"node-name":"drive-scsi9","read-only":false,"throttle-group":"throttle-drive-scsi9"}' \
-device 'scsi-hd,bus=scsihw1.0,scsi-id=2,drive=drive-scsi9,id=scsi9,device_id=drive-scsi9,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"rbd","image":"vm-8006-disk-8","node-name":"e6f4cbffa741d16bba69304eb2800ef","pool":"cpool","read-only":false,"server":[{"host":"127.0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","port":"3300"}]},"node-name":"f6f4cbffa741d16bba69304eb2800ef","read-only":false},"node-name":"drive-scsi10","read-only":false,"throttle-group":"throttle-drive-scsi10"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"rbd","image":"vol-vm-8006-disk-8","node-name":"e6f4cbffa741d16bba69304eb2800ef","pool":"cpool","read-only":false,"server":[{"host":"127.0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","port":"3300"}]},"node-name":"f6f4cbffa741d16bba69304eb2800ef","read-only":false},"node-name":"drive-scsi10","read-only":false,"throttle-group":"throttle-drive-scsi10"}' \
-device 'scsi-hd,bus=scsihw1.0,scsi-id=3,drive=drive-scsi10,id=scsi10,device_id=drive-scsi10,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"rbd","image":"vm-8006-disk-8","node-name":"e42375c54de70f5f4be966d98c90255","pool":"cpool","read-only":false,"server":[{"host":"127.0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","port":"3300"}]},"node-name":"f42375c54de70f5f4be966d98c90255","read-only":false},"node-name":"drive-scsi11","read-only":false,"throttle-group":"throttle-drive-scsi11"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"rbd","image":"vol-vm-8006-disk-8","node-name":"e42375c54de70f5f4be966d98c90255","pool":"cpool","read-only":false,"server":[{"host":"127.0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","port":"3300"}]},"node-name":"f42375c54de70f5f4be966d98c90255","read-only":false},"node-name":"drive-scsi11","read-only":false,"throttle-group":"throttle-drive-scsi11"}' \
-device 'scsi-hd,bus=scsihw1.0,scsi-id=4,drive=drive-scsi11,id=scsi11,device_id=drive-scsi11,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/veegee/vm-8006-disk-9","node-name":"ed7b2c9e0133619fcf6cb8ce5903502","read-only":false},"node-name":"fd7b2c9e0133619fcf6cb8ce5903502","read-only":false},"node-name":"drive-scsi12","read-only":false,"throttle-group":"throttle-drive-scsi12"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/veegee/vol-vm-8006-disk-9","node-name":"ed7b2c9e0133619fcf6cb8ce5903502","read-only":false},"node-name":"fd7b2c9e0133619fcf6cb8ce5903502","read-only":false},"node-name":"drive-scsi12","read-only":false,"throttle-group":"throttle-drive-scsi12"}' \
-device 'scsi-hd,bus=scsihw1.0,scsi-id=5,drive=drive-scsi12,id=scsi12,device_id=drive-scsi12,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/veegee/vm-8006-disk-9","node-name":"ed85420a880203ca1401d00a8edf132","read-only":false},"node-name":"fd85420a880203ca1401d00a8edf132","read-only":false},"node-name":"drive-scsi13","read-only":false,"throttle-group":"throttle-drive-scsi13"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/veegee/vol-vm-8006-disk-9","node-name":"ed85420a880203ca1401d00a8edf132","read-only":false},"node-name":"fd85420a880203ca1401d00a8edf132","read-only":false},"node-name":"drive-scsi13","read-only":false,"throttle-group":"throttle-drive-scsi13"}' \
-device 'scsi-hd,bus=scsihw1.0,scsi-id=6,drive=drive-scsi13,id=scsi13,device_id=drive-scsi13,write-cache=on' \
-machine 'type=pc+pve0'
diff --git a/src/test/cfg2cmd/bootorder-empty.conf b/src/test/cfg2cmd/bootorder-empty.conf
index ccfadb9f..0f6934a8 100644
--- a/src/test/cfg2cmd/bootorder-empty.conf
+++ b/src/test/cfg2cmd/bootorder-empty.conf
@@ -7,9 +7,9 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi4: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858K
+scsi4: local:8006/vol-vm-8006-disk-0.qcow2,discard=on,size=104858K
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
-virtio0: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
-virtio1: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
+virtio0: local:8006/vol-vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
+virtio1: local:8006/vol-vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8
diff --git a/src/test/cfg2cmd/bootorder-empty.conf.cmd b/src/test/cfg2cmd/bootorder-empty.conf.cmd
index 3516b344..b53e303b 100644
--- a/src/test/cfg2cmd/bootorder-empty.conf.cmd
+++ b/src/test/cfg2cmd/bootorder-empty.conf.cmd
@@ -32,11 +32,11 @@
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-device 'ide-cd,bus=ide.1,unit=0,id=ide2' \
-device 'lsi,id=scsihw0,bus=pci.0,addr=0x5' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-name":"e6bf62e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"f6bf62e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"drive-scsi4","read-only":false,"throttle-group":"throttle-drive-scsi4"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-0.qcow2","node-name":"e6bf62e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"f6bf62e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"drive-scsi4","read-only":false,"throttle-group":"throttle-drive-scsi4"}' \
-device 'scsi-hd,bus=scsihw0.0,scsi-id=4,drive=drive-scsi4,id=scsi4,device_id=drive-scsi4,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-name":"edd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"fdd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"drive-virtio0","read-only":false,"throttle-group":"throttle-drive-virtio0"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-0.qcow2","node-name":"edd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"fdd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"drive-virtio0","read-only":false,"throttle-group":"throttle-drive-virtio0"}' \
-device 'virtio-blk-pci,drive=drive-virtio0,id=virtio0,bus=pci.0,addr=0xa,iothread=iothread-virtio0,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-name":"eeb683fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"feb683fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"drive-virtio1","read-only":false,"throttle-group":"throttle-drive-virtio1"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-0.qcow2","node-name":"eeb683fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"feb683fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"drive-virtio1","read-only":false,"throttle-group":"throttle-drive-virtio1"}' \
-device 'virtio-blk-pci,drive=drive-virtio1,id=virtio1,bus=pci.0,addr=0xb,iothread=iothread-virtio1,write-cache=on' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=A2:C0:43:77:08:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256' \
diff --git a/src/test/cfg2cmd/bootorder-legacy.conf b/src/test/cfg2cmd/bootorder-legacy.conf
index 4e59268b..da521616 100644
--- a/src/test/cfg2cmd/bootorder-legacy.conf
+++ b/src/test/cfg2cmd/bootorder-legacy.conf
@@ -8,9 +8,9 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi4: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858K
+scsi4: local:8006/vol-vm-8006-disk-0.qcow2,discard=on,size=104858K
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
-virtio0: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
-virtio1: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
+virtio0: local:8006/vol-vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
+virtio1: local:8006/vol-vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8
diff --git a/src/test/cfg2cmd/bootorder-legacy.conf.cmd b/src/test/cfg2cmd/bootorder-legacy.conf.cmd
index c86ab6f9..85b2ec50 100644
--- a/src/test/cfg2cmd/bootorder-legacy.conf.cmd
+++ b/src/test/cfg2cmd/bootorder-legacy.conf.cmd
@@ -32,11 +32,11 @@
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-device 'ide-cd,bus=ide.1,unit=0,id=ide2,bootindex=200' \
-device 'lsi,id=scsihw0,bus=pci.0,addr=0x5' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-name":"e6bf62e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"f6bf62e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"drive-scsi4","read-only":false,"throttle-group":"throttle-drive-scsi4"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-0.qcow2","node-name":"e6bf62e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"f6bf62e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"drive-scsi4","read-only":false,"throttle-group":"throttle-drive-scsi4"}' \
-device 'scsi-hd,bus=scsihw0.0,scsi-id=4,drive=drive-scsi4,id=scsi4,device_id=drive-scsi4,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-name":"edd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"fdd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"drive-virtio0","read-only":false,"throttle-group":"throttle-drive-virtio0"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-0.qcow2","node-name":"edd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"fdd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"drive-virtio0","read-only":false,"throttle-group":"throttle-drive-virtio0"}' \
-device 'virtio-blk-pci,drive=drive-virtio0,id=virtio0,bus=pci.0,addr=0xa,iothread=iothread-virtio0,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-name":"eeb683fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"feb683fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"drive-virtio1","read-only":false,"throttle-group":"throttle-drive-virtio1"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-0.qcow2","node-name":"eeb683fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"feb683fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"drive-virtio1","read-only":false,"throttle-group":"throttle-drive-virtio1"}' \
-device 'virtio-blk-pci,drive=drive-virtio1,id=virtio1,bus=pci.0,addr=0xb,iothread=iothread-virtio1,bootindex=302,write-cache=on' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=A2:C0:43:77:08:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=100' \
diff --git a/src/test/cfg2cmd/bootorder.conf b/src/test/cfg2cmd/bootorder.conf
index 7991065d..edd7c4fd 100644
--- a/src/test/cfg2cmd/bootorder.conf
+++ b/src/test/cfg2cmd/bootorder.conf
@@ -7,9 +7,9 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi4: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858K
+scsi4: local:8006/vol-vm-8006-disk-0.qcow2,discard=on,size=104858K
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
-virtio0: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
-virtio1: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
+virtio0: local:8006/vol-vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
+virtio1: local:8006/vol-vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8
diff --git a/src/test/cfg2cmd/bootorder.conf.cmd b/src/test/cfg2cmd/bootorder.conf.cmd
index 48f9da8b..78e6c51b 100644
--- a/src/test/cfg2cmd/bootorder.conf.cmd
+++ b/src/test/cfg2cmd/bootorder.conf.cmd
@@ -32,11 +32,11 @@
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-device 'ide-cd,bus=ide.1,unit=0,id=ide2,bootindex=103' \
-device 'lsi,id=scsihw0,bus=pci.0,addr=0x5' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-name":"e6bf62e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"f6bf62e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"drive-scsi4","read-only":false,"throttle-group":"throttle-drive-scsi4"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-0.qcow2","node-name":"e6bf62e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"f6bf62e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"drive-scsi4","read-only":false,"throttle-group":"throttle-drive-scsi4"}' \
-device 'scsi-hd,bus=scsihw0.0,scsi-id=4,drive=drive-scsi4,id=scsi4,device_id=drive-scsi4,bootindex=102,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-name":"edd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"fdd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"drive-virtio0","read-only":false,"throttle-group":"throttle-drive-virtio0"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-0.qcow2","node-name":"edd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"fdd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"drive-virtio0","read-only":false,"throttle-group":"throttle-drive-virtio0"}' \
-device 'virtio-blk-pci,drive=drive-virtio0,id=virtio0,bus=pci.0,addr=0xa,iothread=iothread-virtio0,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-name":"eeb683fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"feb683fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"drive-virtio1","read-only":false,"throttle-group":"throttle-drive-virtio1"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-0.qcow2","node-name":"eeb683fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"feb683fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"drive-virtio1","read-only":false,"throttle-group":"throttle-drive-virtio1"}' \
-device 'virtio-blk-pci,drive=drive-virtio1,id=virtio1,bus=pci.0,addr=0xb,iothread=iothread-virtio1,bootindex=100,write-cache=on' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=A2:C0:43:77:08:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=101' \
diff --git a/src/test/cfg2cmd/efi-raw-old.conf b/src/test/cfg2cmd/efi-raw-old.conf
index 621470ed..0437d2e6 100644
--- a/src/test/cfg2cmd/efi-raw-old.conf
+++ b/src/test/cfg2cmd/efi-raw-old.conf
@@ -2,4 +2,4 @@
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
bios: ovmf
machine: pc-i440fx-4.1+pve0
-efidisk0: local:100/vm-100-disk-0.raw
+efidisk0: local:100/vol-vm-100-disk-0.raw
diff --git a/src/test/cfg2cmd/efi-raw-old.conf.cmd b/src/test/cfg2cmd/efi-raw-old.conf.cmd
index b62967bd..14acfa6e 100644
--- a/src/test/cfg2cmd/efi-raw-old.conf.cmd
+++ b/src/test/cfg2cmd/efi-raw-old.conf.cmd
@@ -10,7 +10,7 @@
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
-drive 'if=pflash,unit=0,format=raw,readonly=on,file=/usr/share/pve-edk2-firmware//OVMF_CODE.fd' \
- -drive 'if=pflash,unit=1,id=drive-efidisk0,format=raw,file=/var/lib/vz/images/100/vm-100-disk-0.raw' \
+ -drive 'if=pflash,unit=1,id=drive-efidisk0,format=raw,file=/var/lib/vz/vms/100/vol-vm-100-disk-0.raw' \
-smp '1,sockets=1,cores=1,maxcpus=1' \
-nodefaults \
-boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
diff --git a/src/test/cfg2cmd/efi-raw.conf b/src/test/cfg2cmd/efi-raw.conf
index 37f0358f..5f7399be 100644
--- a/src/test/cfg2cmd/efi-raw.conf
+++ b/src/test/cfg2cmd/efi-raw.conf
@@ -1,4 +1,4 @@
# TEST: Test raw efidisk size parameter
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
bios: ovmf
-efidisk0: local:100/vm-100-disk-0.raw
+efidisk0: local:100/vol-vm-100-disk-0.raw
diff --git a/src/test/cfg2cmd/efi-raw.conf.cmd b/src/test/cfg2cmd/efi-raw.conf.cmd
index d3b2ec8c..74841d17 100644
--- a/src/test/cfg2cmd/efi-raw.conf.cmd
+++ b/src/test/cfg2cmd/efi-raw.conf.cmd
@@ -11,7 +11,7 @@
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
-object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \
-blockdev '{"driver":"raw","file":{"driver":"file","filename":"/usr/share/pve-edk2-firmware//OVMF_CODE.fd"},"node-name":"pflash0","read-only":true}' \
- -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/images/100/vm-100-disk-0.raw","node-name":"e1175f2a490414e7c53337589fde17a","read-only":false},"node-name":"f1175f2a490414e7c53337589fde17a","read-only":false,"size":131072},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
+ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/vms/100/vol-vm-100-disk-0.raw","node-name":"e1175f2a490414e7c53337589fde17a","read-only":false},"node-name":"f1175f2a490414e7c53337589fde17a","read-only":false,"size":131072},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
-smp '1,sockets=1,cores=1,maxcpus=1' \
-nodefaults \
-boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
diff --git a/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf b/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf
index 51e525b3..65ebec5f 100644
--- a/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf
+++ b/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf
@@ -2,5 +2,5 @@
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
bios: ovmf
machine: q35
-efidisk0: local:100/vm-100-disk-0.raw,efitype=4m,pre-enrolled-keys=1,size=528K
-tpmstate0: local:108/vm-100-disk-1.raw,size=4M,version=v2.0
+efidisk0: local:100/vol-vm-100-disk-0.raw,efitype=4m,pre-enrolled-keys=1,size=528K
+tpmstate0: local:108/vol-vm-100-disk-1.raw,size=4M,version=v2.0
diff --git a/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd b/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd
index 3d6279e9..905fd1b6 100644
--- a/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd
+++ b/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd
@@ -11,7 +11,7 @@
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
-object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \
-blockdev '{"driver":"raw","file":{"driver":"file","filename":"/usr/share/pve-edk2-firmware//OVMF_CODE_4M.secboot.fd"},"node-name":"pflash0","read-only":true}' \
- -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/images/100/vm-100-disk-0.raw","node-name":"e1175f2a490414e7c53337589fde17a","read-only":false},"node-name":"f1175f2a490414e7c53337589fde17a","read-only":false,"size":540672},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
+ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/vms/100/vol-vm-100-disk-0.raw","node-name":"e1175f2a490414e7c53337589fde17a","read-only":false},"node-name":"f1175f2a490414e7c53337589fde17a","read-only":false,"size":540672},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
-smp '1,sockets=1,cores=1,maxcpus=1' \
-nodefaults \
-boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
diff --git a/src/test/cfg2cmd/efi-secboot-and-tpm.conf b/src/test/cfg2cmd/efi-secboot-and-tpm.conf
index 4856b531..7dda3d14 100644
--- a/src/test/cfg2cmd/efi-secboot-and-tpm.conf
+++ b/src/test/cfg2cmd/efi-secboot-and-tpm.conf
@@ -1,5 +1,5 @@
# TEST: Test newer 4MB efidisk with secureboot and a TPM device
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
bios: ovmf
-efidisk0: local:100/vm-100-disk-0.raw,efitype=4m,pre-enrolled-keys=1,size=528K
-tpmstate0: local:108/vm-100-disk-1.raw,size=4M,version=v2.0
+efidisk0: local:100/vol-vm-100-disk-0.raw,efitype=4m,pre-enrolled-keys=1,size=528K
+tpmstate0: local:108/vol-vm-100-disk-1.raw,size=4M,version=v2.0
diff --git a/src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd b/src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd
index f705aa84..96d9c285 100644
--- a/src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd
+++ b/src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd
@@ -11,7 +11,7 @@
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
-object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \
-blockdev '{"driver":"raw","file":{"driver":"file","filename":"/usr/share/pve-edk2-firmware//OVMF_CODE_4M.fd"},"node-name":"pflash0","read-only":true}' \
- -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/images/100/vm-100-disk-0.raw","node-name":"e1175f2a490414e7c53337589fde17a","read-only":false},"node-name":"f1175f2a490414e7c53337589fde17a","read-only":false,"size":540672},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
+ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/vms/100/vol-vm-100-disk-0.raw","node-name":"e1175f2a490414e7c53337589fde17a","read-only":false},"node-name":"f1175f2a490414e7c53337589fde17a","read-only":false,"size":540672},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
-smp '1,sockets=1,cores=1,maxcpus=1' \
-nodefaults \
-boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
diff --git a/src/test/cfg2cmd/efidisk-on-rbd.conf b/src/test/cfg2cmd/efidisk-on-rbd.conf
index 1958fe61..d6d9361e 100644
--- a/src/test/cfg2cmd/efidisk-on-rbd.conf
+++ b/src/test/cfg2cmd/efidisk-on-rbd.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 1
-efidisk0: rbd-store:vm-100-disk-1,size=128K
+efidisk0: rbd-store:vol-vm-100-disk-1,size=128K
memory: 512
net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
numa: 1
diff --git a/src/test/cfg2cmd/efidisk-on-rbd.conf.cmd b/src/test/cfg2cmd/efidisk-on-rbd.conf.cmd
index 5d0c8aff..dcab512c 100644
--- a/src/test/cfg2cmd/efidisk-on-rbd.conf.cmd
+++ b/src/test/cfg2cmd/efidisk-on-rbd.conf.cmd
@@ -11,7 +11,7 @@
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e688' \
-object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \
-blockdev '{"driver":"raw","file":{"driver":"file","filename":"/usr/share/pve-edk2-firmware//OVMF_CODE.fd"},"node-name":"pflash0","read-only":true}' \
- -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"raw","file":{"auth-client-required":["none"],"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"rbd","image":"vm-100-disk-1","node-name":"eeb8f022b5551ad1d795611f112c767","pool":"cpool","read-only":false,"server":[{"host":"127.0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","port":"3300"}]},"node-name":"feb8f022b5551ad1d795611f112c767","read-only":false,"size":131072},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
+ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"raw","file":{"auth-client-required":["none"],"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"rbd","image":"vol-vm-100-disk-1","node-name":"eeb8f022b5551ad1d795611f112c767","pool":"cpool","read-only":false,"server":[{"host":"127.0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","port":"3300"}]},"node-name":"feb8f022b5551ad1d795611f112c767","read-only":false,"size":131072},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
-smp '1,sockets=1,cores=1,maxcpus=1' \
-nodefaults \
-boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
diff --git a/src/test/cfg2cmd/i440fx-win10-hostpci.conf b/src/test/cfg2cmd/i440fx-win10-hostpci.conf
index 2ab2dda1..3585ce7e 100644
--- a/src/test/cfg2cmd/i440fx-win10-hostpci.conf
+++ b/src/test/cfg2cmd/i440fx-win10-hostpci.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 1
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vol-vm-100-disk-1.qcow2,size=128K
hostpci0: 0f:f2.0
machine: pc
memory: 512
diff --git a/src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd b/src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd
index ca648dab..437b1772 100644
--- a/src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd
+++ b/src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd
@@ -10,7 +10,7 @@
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
-drive 'if=pflash,unit=0,format=raw,readonly=on,file=/usr/share/pve-edk2-firmware//OVMF_CODE.fd' \
- -drive 'if=pflash,unit=1,id=drive-efidisk0,format=qcow2,file=/var/lib/vz/images/100/vm-100-disk-1.qcow2' \
+ -drive 'if=pflash,unit=1,id=drive-efidisk0,format=qcow2,file=/var/lib/vz/vms/100/vol-vm-100-disk-1.qcow2' \
-smp '2,sockets=2,cores=1,maxcpus=2' \
-nodefaults \
-boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
diff --git a/src/test/cfg2cmd/ide-no-media-error.conf b/src/test/cfg2cmd/ide-no-media-error.conf
index 48971463..e42771a2 100644
--- a/src/test/cfg2cmd/ide-no-media-error.conf
+++ b/src/test/cfg2cmd/ide-no-media-error.conf
@@ -9,7 +9,7 @@ ide3: cifs-store:iso/three.iso,size=112M
memory: 512
net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
ostype: l26
-scsi0: local:100/vm-100-disk-2.qcow2,size=10G
+scsi0: local:100/vol-vm-100-disk-2.qcow2,size=10G
scsihw: virtio-scsi-pci
smbios1: uuid=3dd750ce-d910-44d0-9493-525c0be4e687
vmgenid: 54d1c06c-8f5b-440f-b5b2-6eab1380e13d
diff --git a/src/test/cfg2cmd/ide.conf b/src/test/cfg2cmd/ide.conf
index 8f565ab1..a2cb70bf 100644
--- a/src/test/cfg2cmd/ide.conf
+++ b/src/test/cfg2cmd/ide.conf
@@ -8,7 +8,7 @@ ide3: cifs-store:iso/three.iso,media=cdrom,size=112M
memory: 512
net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
ostype: l26
-scsi0: local:100/vm-100-disk-2.qcow2,size=10G
+scsi0: local:100/vol-vm-100-disk-2.qcow2,size=10G
scsihw: virtio-scsi-pci
smbios1: uuid=3dd750ce-d910-44d0-9493-525c0be4e687
vmgenid: 54d1c06c-8f5b-440f-b5b2-6eab1380e13d
diff --git a/src/test/cfg2cmd/ide.conf.cmd b/src/test/cfg2cmd/ide.conf.cmd
index 6b5a52a9..73dfdfab 100644
--- a/src/test/cfg2cmd/ide.conf.cmd
+++ b/src/test/cfg2cmd/ide.conf.cmd
@@ -39,7 +39,7 @@
-blockdev '{"driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"driver":"file","filename":"/mnt/pve/cifs-store/template/iso/three.iso","node-name":"e35557bae4bcbf9edc9f7ff7f132f30","read-only":true},"node-name":"f35557bae4bcbf9edc9f7ff7f132f30","read-only":true},"node-name":"drive-ide3","read-only":true,"throttle-group":"throttle-drive-ide3"}' \
-device 'ide-cd,bus=ide.1,unit=1,drive=drive-ide3,id=ide3,bootindex=203' \
-device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \
- -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/images/100/vm-100-disk-2.qcow2","node-name":"ec11e0572184321efc5835152b95d5d","read-only":false},"node-name":"fc11e0572184321efc5835152b95d5d","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
+ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/vms/100/vol-vm-100-disk-2.qcow2","node-name":"ec11e0572184321efc5835152b95d5d","read-only":false},"node-name":"fc11e0572184321efc5835152b95d5d","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,device_id=drive-scsi0,bootindex=100,write-cache=on' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300' \
diff --git a/src/test/cfg2cmd/pinned-version-pxe-pve.conf b/src/test/cfg2cmd/pinned-version-pxe-pve.conf
index 36169d7b..dc9bb4f5 100644
--- a/src/test/cfg2cmd/pinned-version-pxe-pve.conf
+++ b/src/test/cfg2cmd/pinned-version-pxe-pve.conf
@@ -8,7 +8,7 @@ name: pinned
net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: local:8006/vm-8006-disk-0.raw,discard=on,size=104858K
+scsi0: local:8006/vol-vm-8006-disk-0.raw,discard=on,size=104858K
scsihw: virtio-scsi-pci
smbios1: uuid=c7fdd046-fefc-11e9-832e-770e1d5636a0
sockets: 1
diff --git a/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd b/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd
index 7301e3fa..b1e7e054 100644
--- a/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd
+++ b/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd
@@ -26,7 +26,7 @@
-drive 'if=none,id=drive-ide2,media=cdrom,aio=io_uring' \
-device 'ide-cd,bus=ide.1,unit=0,drive=drive-ide2,id=ide2,bootindex=200' \
-device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \
- -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.raw,if=none,id=drive-scsi0,discard=on,format=raw,cache=none,aio=io_uring,detect-zeroes=unmap' \
+ -drive 'file=/var/lib/vz/vms/8006/vol-vm-8006-disk-0.raw,if=none,id=drive-scsi0,discard=on,format=raw,cache=none,aio=io_uring,detect-zeroes=unmap' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,bootindex=100' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300,romfile=pxe-virtio.rom' \
diff --git a/src/test/cfg2cmd/pinned-version-pxe.conf b/src/test/cfg2cmd/pinned-version-pxe.conf
index 738868f2..40ed2cdf 100644
--- a/src/test/cfg2cmd/pinned-version-pxe.conf
+++ b/src/test/cfg2cmd/pinned-version-pxe.conf
@@ -8,7 +8,7 @@ name: pinned
net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: local:8006/vm-8006-disk-0.raw,discard=on,size=104858K
+scsi0: local:8006/vol-vm-8006-disk-0.raw,discard=on,size=104858K
scsihw: virtio-scsi-pci
smbios1: uuid=c7fdd046-fefc-11e9-832e-770e1d5636a0
sockets: 1
diff --git a/src/test/cfg2cmd/pinned-version-pxe.conf.cmd b/src/test/cfg2cmd/pinned-version-pxe.conf.cmd
index 89be8c69..4fd9db4d 100644
--- a/src/test/cfg2cmd/pinned-version-pxe.conf.cmd
+++ b/src/test/cfg2cmd/pinned-version-pxe.conf.cmd
@@ -24,7 +24,7 @@
-drive 'if=none,id=drive-ide2,media=cdrom,aio=io_uring' \
-device 'ide-cd,bus=ide.1,unit=0,drive=drive-ide2,id=ide2,bootindex=200' \
-device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \
- -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.raw,if=none,id=drive-scsi0,discard=on,format=raw,cache=none,aio=io_uring,detect-zeroes=unmap' \
+ -drive 'file=/var/lib/vz/vms/8006/vol-vm-8006-disk-0.raw,if=none,id=drive-scsi0,discard=on,format=raw,cache=none,aio=io_uring,detect-zeroes=unmap' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,bootindex=100' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300,romfile=pxe-virtio.rom' \
diff --git a/src/test/cfg2cmd/pinned-version.conf b/src/test/cfg2cmd/pinned-version.conf
index 61191836..3a833151 100644
--- a/src/test/cfg2cmd/pinned-version.conf
+++ b/src/test/cfg2cmd/pinned-version.conf
@@ -8,7 +8,7 @@ name: pinned
net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: local:8006/vm-8006-disk-0.raw,discard=on,size=104858K
+scsi0: local:8006/vol-vm-8006-disk-0.raw,discard=on,size=104858K
scsihw: virtio-scsi-pci
smbios1: uuid=c7fdd046-fefc-11e9-832e-770e1d5636a0
sockets: 1
diff --git a/src/test/cfg2cmd/pinned-version.conf.cmd b/src/test/cfg2cmd/pinned-version.conf.cmd
index da161ad9..397cee4b 100644
--- a/src/test/cfg2cmd/pinned-version.conf.cmd
+++ b/src/test/cfg2cmd/pinned-version.conf.cmd
@@ -24,7 +24,7 @@
-drive 'if=none,id=drive-ide2,media=cdrom,aio=io_uring' \
-device 'ide-cd,bus=ide.1,unit=0,drive=drive-ide2,id=ide2,bootindex=200' \
-device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \
- -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.raw,if=none,id=drive-scsi0,discard=on,format=raw,cache=none,aio=io_uring,detect-zeroes=unmap' \
+ -drive 'file=/var/lib/vz/vms/8006/vol-vm-8006-disk-0.raw,if=none,id=drive-scsi0,discard=on,format=raw,cache=none,aio=io_uring,detect-zeroes=unmap' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,bootindex=100' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \
diff --git a/src/test/cfg2cmd/q35-ide.conf b/src/test/cfg2cmd/q35-ide.conf
index bfef0a14..00fc52ef 100644
--- a/src/test/cfg2cmd/q35-ide.conf
+++ b/src/test/cfg2cmd/q35-ide.conf
@@ -9,7 +9,7 @@ machine: q35
memory: 512
net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
ostype: l26
-scsi0: local:100/vm-100-disk-2.qcow2,size=10G
+scsi0: local:100/vol-vm-100-disk-2.qcow2,size=10G
scsihw: virtio-scsi-pci
smbios1: uuid=3dd750ce-d910-44d0-9493-525c0be4e687
vmgenid: 54d1c06c-8f5b-440f-b5b2-6eab1380e13d
diff --git a/src/test/cfg2cmd/q35-ide.conf.cmd b/src/test/cfg2cmd/q35-ide.conf.cmd
index 475e58d9..0a5ffd0e 100644
--- a/src/test/cfg2cmd/q35-ide.conf.cmd
+++ b/src/test/cfg2cmd/q35-ide.conf.cmd
@@ -38,7 +38,7 @@
-blockdev '{"driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"driver":"file","filename":"/mnt/pve/cifs-store/template/iso/three.iso","node-name":"e35557bae4bcbf9edc9f7ff7f132f30","read-only":true},"node-name":"f35557bae4bcbf9edc9f7ff7f132f30","read-only":true},"node-name":"drive-ide3","read-only":true,"throttle-group":"throttle-drive-ide3"}' \
-device 'ide-cd,bus=ide.3,unit=0,drive=drive-ide3,id=ide3,bootindex=203' \
-device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \
- -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/images/100/vm-100-disk-2.qcow2","node-name":"ec11e0572184321efc5835152b95d5d","read-only":false},"node-name":"fc11e0572184321efc5835152b95d5d","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
+ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/vms/100/vol-vm-100-disk-2.qcow2","node-name":"ec11e0572184321efc5835152b95d5d","read-only":false},"node-name":"fc11e0572184321efc5835152b95d5d","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,device_id=drive-scsi0,bootindex=100,write-cache=on' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300' \
diff --git a/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf b/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf
index 2366fc4a..ef66f9a7 100644
--- a/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf
+++ b/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 1
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vol-vm-100-disk-1.qcow2,size=128K
hostpci0: mapping=someNic
hostpci1: mapping=someGpu,mdev=some-model
hostpci2: mapping=someNic
diff --git a/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd
index b0c3e587..2c3e4539 100644
--- a/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd
+++ b/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd
@@ -11,7 +11,7 @@
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
-object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \
-blockdev '{"driver":"raw","file":{"driver":"file","filename":"/usr/share/pve-edk2-firmware//OVMF_CODE.fd"},"node-name":"pflash0","read-only":true}' \
- -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/images/100/vm-100-disk-1.qcow2","node-name":"e70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"f70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
+ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/vms/100/vol-vm-100-disk-1.qcow2","node-name":"e70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"f70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
-global 'ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off' \
-smp '2,sockets=2,cores=1,maxcpus=2' \
-nodefaults \
diff --git a/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf b/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf
index 5f1a3ff7..9054a025 100644
--- a/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf
+++ b/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 1
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vol-vm-100-disk-1.qcow2,size=128K
hostpci0: f0:43
hostpci1: 1234:f0:43
machine: q35
diff --git a/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd
index b4aa46f5..219af1c4 100644
--- a/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd
+++ b/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd
@@ -11,7 +11,7 @@
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
-object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \
-blockdev '{"driver":"raw","file":{"driver":"file","filename":"/usr/share/pve-edk2-firmware//OVMF_CODE.fd"},"node-name":"pflash0","read-only":true}' \
- -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/images/100/vm-100-disk-1.qcow2","node-name":"e70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"f70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
+ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/vms/100/vol-vm-100-disk-1.qcow2","node-name":"e70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"f70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
-global 'ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off' \
-smp '2,sockets=2,cores=1,maxcpus=2' \
-nodefaults \
diff --git a/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf b/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf
index b726a3a4..76190056 100644
--- a/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf
+++ b/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 1
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vol-vm-100-disk-1.qcow2,size=128K
hostpci0: 00:ff.1,vendor-id=0x1234,device-id=0x5678,sub-vendor-id=0x2233,sub-device-id=0x0000
hostpci1: d0:13.0,pcie=1,vendor-id=0x1234,device-id=0x5678
machine: q35
diff --git a/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd
index 6c4937c7..bfdba6d2 100644
--- a/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd
+++ b/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd
@@ -11,7 +11,7 @@
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
-object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \
-blockdev '{"driver":"raw","file":{"driver":"file","filename":"/usr/share/pve-edk2-firmware//OVMF_CODE.fd"},"node-name":"pflash0","read-only":true}' \
- -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/images/100/vm-100-disk-1.qcow2","node-name":"e70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"f70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
+ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/vms/100/vol-vm-100-disk-1.qcow2","node-name":"e70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"f70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
-global 'ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off' \
-smp '2,sockets=2,cores=1,maxcpus=2' \
-nodefaults \
diff --git a/src/test/cfg2cmd/q35-linux-hostpci.conf b/src/test/cfg2cmd/q35-linux-hostpci.conf
index 7290120a..fb5b299d 100644
--- a/src/test/cfg2cmd/q35-linux-hostpci.conf
+++ b/src/test/cfg2cmd/q35-linux-hostpci.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 1
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vol-vm-100-disk-1.qcow2,size=128K
hostpci0: 00:ff.1
hostpci1: d0:13.0,pcie=1
hostpci2: 00:f4.0
diff --git a/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd
index 19e6ba3c..b6edad85 100644
--- a/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd
+++ b/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd
@@ -11,7 +11,7 @@
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
-object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \
-blockdev '{"driver":"raw","file":{"driver":"file","filename":"/usr/share/pve-edk2-firmware//OVMF_CODE.fd"},"node-name":"pflash0","read-only":true}' \
- -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/images/100/vm-100-disk-1.qcow2","node-name":"e70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"f70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
+ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/vms/100/vol-vm-100-disk-1.qcow2","node-name":"e70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"f70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
-global 'ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off' \
-smp '2,sockets=2,cores=1,maxcpus=2' \
-nodefaults \
diff --git a/src/test/cfg2cmd/q35-simple-6.0.conf b/src/test/cfg2cmd/q35-simple-6.0.conf
index d482dfea..19bb6fae 100644
--- a/src/test/cfg2cmd/q35-simple-6.0.conf
+++ b/src/test/cfg2cmd/q35-simple-6.0.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 2
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vol-vm-100-disk-1.qcow2,size=128K
machine: pc-q35-6.0
memory: 512
net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
diff --git a/src/test/cfg2cmd/q35-simple-6.0.conf.cmd b/src/test/cfg2cmd/q35-simple-6.0.conf.cmd
index 858dd11c..2e4885df 100644
--- a/src/test/cfg2cmd/q35-simple-6.0.conf.cmd
+++ b/src/test/cfg2cmd/q35-simple-6.0.conf.cmd
@@ -10,7 +10,7 @@
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
-drive 'if=pflash,unit=0,format=raw,readonly=on,file=/usr/share/pve-edk2-firmware//OVMF_CODE.fd' \
- -drive 'if=pflash,unit=1,id=drive-efidisk0,format=qcow2,file=/var/lib/vz/images/100/vm-100-disk-1.qcow2' \
+ -drive 'if=pflash,unit=1,id=drive-efidisk0,format=qcow2,file=/var/lib/vz/vms/100/vol-vm-100-disk-1.qcow2' \
-smp '2,sockets=1,cores=2,maxcpus=2' \
-nodefaults \
-boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
diff --git a/src/test/cfg2cmd/q35-simple-7.0.conf b/src/test/cfg2cmd/q35-simple-7.0.conf
index 9e3097ee..01029bc2 100644
--- a/src/test/cfg2cmd/q35-simple-7.0.conf
+++ b/src/test/cfg2cmd/q35-simple-7.0.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 2
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vol-vm-100-disk-1.qcow2,size=128K
machine: pc-q35-7.0
meta: creation-qemu=6.1
memory: 512
diff --git a/src/test/cfg2cmd/q35-simple-7.0.conf.cmd b/src/test/cfg2cmd/q35-simple-7.0.conf.cmd
index 7a241d09..af4885e5 100644
--- a/src/test/cfg2cmd/q35-simple-7.0.conf.cmd
+++ b/src/test/cfg2cmd/q35-simple-7.0.conf.cmd
@@ -10,7 +10,7 @@
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
-drive 'if=pflash,unit=0,format=raw,readonly=on,file=/usr/share/pve-edk2-firmware//OVMF_CODE.fd' \
- -drive 'if=pflash,unit=1,id=drive-efidisk0,format=qcow2,file=/var/lib/vz/images/100/vm-100-disk-1.qcow2' \
+ -drive 'if=pflash,unit=1,id=drive-efidisk0,format=qcow2,file=/var/lib/vz/vms/100/vol-vm-100-disk-1.qcow2' \
-smp '2,sockets=1,cores=2,maxcpus=2' \
-nodefaults \
-boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
diff --git a/src/test/cfg2cmd/q35-simple-pinned-6.1.conf b/src/test/cfg2cmd/q35-simple-pinned-6.1.conf
index 9ecfe006..5028e8e4 100644
--- a/src/test/cfg2cmd/q35-simple-pinned-6.1.conf
+++ b/src/test/cfg2cmd/q35-simple-pinned-6.1.conf
@@ -3,7 +3,7 @@
bios: ovmf
bootdisk: scsi0
cores: 2
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vol-vm-100-disk-1.qcow2,size=128K
machine: pc-q35-6.1
memory: 512
net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
diff --git a/src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd b/src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd
index 24a2e299..dd33a0a7 100644
--- a/src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd
+++ b/src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd
@@ -10,7 +10,7 @@
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
-drive 'if=pflash,unit=0,format=raw,readonly=on,file=/usr/share/pve-edk2-firmware//OVMF_CODE.fd' \
- -drive 'if=pflash,unit=1,id=drive-efidisk0,format=qcow2,file=/var/lib/vz/images/100/vm-100-disk-1.qcow2' \
+ -drive 'if=pflash,unit=1,id=drive-efidisk0,format=qcow2,file=/var/lib/vz/vms/100/vol-vm-100-disk-1.qcow2' \
-smp '2,sockets=1,cores=2,maxcpus=2' \
-nodefaults \
-boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
diff --git a/src/test/cfg2cmd/q35-simple.conf b/src/test/cfg2cmd/q35-simple.conf
index 21f78122..27fafed2 100644
--- a/src/test/cfg2cmd/q35-simple.conf
+++ b/src/test/cfg2cmd/q35-simple.conf
@@ -3,7 +3,7 @@
bios: ovmf
bootdisk: scsi0
cores: 2
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vol-vm-100-disk-1.qcow2,size=128K
machine: q35
memory: 512
net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
diff --git a/src/test/cfg2cmd/q35-simple.conf.cmd b/src/test/cfg2cmd/q35-simple.conf.cmd
index e3f712c3..deed9c2d 100644
--- a/src/test/cfg2cmd/q35-simple.conf.cmd
+++ b/src/test/cfg2cmd/q35-simple.conf.cmd
@@ -11,7 +11,7 @@
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
-object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \
-blockdev '{"driver":"raw","file":{"driver":"file","filename":"/usr/share/pve-edk2-firmware//OVMF_CODE.fd"},"node-name":"pflash0","read-only":true}' \
- -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/images/100/vm-100-disk-1.qcow2","node-name":"e70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"f70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
+ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/vms/100/vol-vm-100-disk-1.qcow2","node-name":"e70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"f70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
-global 'ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off' \
-smp '2,sockets=1,cores=2,maxcpus=2' \
-nodefaults \
diff --git a/src/test/cfg2cmd/q35-win10-hostpci.conf b/src/test/cfg2cmd/q35-win10-hostpci.conf
index a8f6e342..5ea44ac6 100644
--- a/src/test/cfg2cmd/q35-win10-hostpci.conf
+++ b/src/test/cfg2cmd/q35-win10-hostpci.conf
@@ -2,7 +2,7 @@
bios: ovmf
bootdisk: scsi0
cores: 1
-efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
+efidisk0: local:100/vol-vm-100-disk-1.qcow2,size=128K
hostpci0: f0:42.0
hostpci1: f0:43.0,pcie=1
hostpci4: 00:43.1,pcie=1
diff --git a/src/test/cfg2cmd/q35-win10-hostpci.conf.cmd b/src/test/cfg2cmd/q35-win10-hostpci.conf.cmd
index 3a4dd6ec..12b2f268 100644
--- a/src/test/cfg2cmd/q35-win10-hostpci.conf.cmd
+++ b/src/test/cfg2cmd/q35-win10-hostpci.conf.cmd
@@ -10,7 +10,7 @@
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
-drive 'if=pflash,unit=0,format=raw,readonly=on,file=/usr/share/pve-edk2-firmware//OVMF_CODE.fd' \
- -drive 'if=pflash,unit=1,id=drive-efidisk0,format=qcow2,file=/var/lib/vz/images/100/vm-100-disk-1.qcow2' \
+ -drive 'if=pflash,unit=1,id=drive-efidisk0,format=qcow2,file=/var/lib/vz/vms/100/vol-vm-100-disk-1.qcow2' \
-smp '2,sockets=2,cores=1,maxcpus=2' \
-nodefaults \
-boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
diff --git a/src/test/cfg2cmd/seabios_serial.conf b/src/test/cfg2cmd/seabios_serial.conf
index 7ebfa504..35fb60f9 100644
--- a/src/test/cfg2cmd/seabios_serial.conf
+++ b/src/test/cfg2cmd/seabios_serial.conf
@@ -7,7 +7,7 @@ name: seabiosserial
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858K
+scsi0: local:8006/vol-vm-8006-disk-0.qcow2,discard=on,size=104858K
scsihw: virtio-scsi-pci
serial0: socket
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
diff --git a/src/test/cfg2cmd/seabios_serial.conf.cmd b/src/test/cfg2cmd/seabios_serial.conf.cmd
index 8fc0509b..b401d58b 100644
--- a/src/test/cfg2cmd/seabios_serial.conf.cmd
+++ b/src/test/cfg2cmd/seabios_serial.conf.cmd
@@ -28,7 +28,7 @@
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-device 'ide-cd,bus=ide.1,unit=0,id=ide2,bootindex=200' \
-device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-name":"ecd04be4259153b8293415fefa2a84c","read-only":false},"node-name":"fcd04be4259153b8293415fefa2a84c","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-0.qcow2","node-name":"ecd04be4259153b8293415fefa2a84c","read-only":false},"node-name":"fcd04be4259153b8293415fefa2a84c","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,device_id=drive-scsi0,bootindex=100,write-cache=on' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=A2:C0:43:77:08:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300' \
diff --git a/src/test/cfg2cmd/sev-es.conf b/src/test/cfg2cmd/sev-es.conf
index 3da71e76..af11fa3a 100644
--- a/src/test/cfg2cmd/sev-es.conf
+++ b/src/test/cfg2cmd/sev-es.conf
@@ -2,5 +2,5 @@
# HW_CAPABILITIES: amd-turin-9005
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
bios: ovmf
-efidisk0: local:100/vm-100-disk-0.raw,efitype=4m,pre-enrolled-keys=1,size=528K
+efidisk0: local:100/vol-vm-100-disk-0.raw,efitype=4m,pre-enrolled-keys=1,size=528K
amd-sev: type=es
diff --git a/src/test/cfg2cmd/sev-es.conf.cmd b/src/test/cfg2cmd/sev-es.conf.cmd
index 3cc2dbc6..d8b9394e 100644
--- a/src/test/cfg2cmd/sev-es.conf.cmd
+++ b/src/test/cfg2cmd/sev-es.conf.cmd
@@ -11,7 +11,7 @@
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
-object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \
-blockdev '{"driver":"raw","file":{"driver":"file","filename":"/usr/share/pve-edk2-firmware//OVMF_CVM_CODE_4M.fd"},"node-name":"pflash0","read-only":true}' \
- -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/images/100/vm-100-disk-0.raw","node-name":"e1175f2a490414e7c53337589fde17a","read-only":false},"node-name":"f1175f2a490414e7c53337589fde17a","read-only":false,"size":540672},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
+ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/vms/100/vol-vm-100-disk-0.raw","node-name":"e1175f2a490414e7c53337589fde17a","read-only":false},"node-name":"f1175f2a490414e7c53337589fde17a","read-only":false,"size":540672},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
-smp '1,sockets=1,cores=1,maxcpus=1' \
-nodefaults \
-boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
diff --git a/src/test/cfg2cmd/sev-std.conf b/src/test/cfg2cmd/sev-std.conf
index a85a08c9..d14605ab 100644
--- a/src/test/cfg2cmd/sev-std.conf
+++ b/src/test/cfg2cmd/sev-std.conf
@@ -2,5 +2,5 @@
# HW_CAPABILITIES: amd-turin-9005
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
bios: ovmf
-efidisk0: local:100/vm-100-disk-0.raw,efitype=4m,pre-enrolled-keys=1,size=528K
+efidisk0: local:100/vol-vm-100-disk-0.raw,efitype=4m,pre-enrolled-keys=1,size=528K
amd-sev: type=std
diff --git a/src/test/cfg2cmd/sev-std.conf.cmd b/src/test/cfg2cmd/sev-std.conf.cmd
index 6291a302..177edae4 100644
--- a/src/test/cfg2cmd/sev-std.conf.cmd
+++ b/src/test/cfg2cmd/sev-std.conf.cmd
@@ -11,7 +11,7 @@
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
-object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \
-blockdev '{"driver":"raw","file":{"driver":"file","filename":"/usr/share/pve-edk2-firmware//OVMF_CVM_CODE_4M.fd"},"node-name":"pflash0","read-only":true}' \
- -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/images/100/vm-100-disk-0.raw","node-name":"e1175f2a490414e7c53337589fde17a","read-only":false},"node-name":"f1175f2a490414e7c53337589fde17a","read-only":false,"size":540672},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
+ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/vms/100/vol-vm-100-disk-0.raw","node-name":"e1175f2a490414e7c53337589fde17a","read-only":false},"node-name":"f1175f2a490414e7c53337589fde17a","read-only":false,"size":540672},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \
-smp '1,sockets=1,cores=1,maxcpus=1' \
-nodefaults \
-boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \
diff --git a/src/test/cfg2cmd/simple-backingchain.conf b/src/test/cfg2cmd/simple-backingchain.conf
index 2c0b0f2c..b3e7654f 100644
--- a/src/test/cfg2cmd/simple-backingchain.conf
+++ b/src/test/cfg2cmd/simple-backingchain.conf
@@ -1,25 +1,25 @@
# TEST: Simple test for external snapshot backing chain
name: simple
parent: snap3
-scsi0: localsnapext:8006/vm-8006-disk-0.qcow2,size=1G
-scsi1: lvm-store:vm-8006-disk-0.qcow2,size=1G
+scsi0: localsnapext:8006/vol-vm-8006-disk-0.qcow2,size=1G
+scsi1: lvm-store:vol-vm-8006-disk-0.qcow2,size=1G

[snap1]
name: simple
-scsi0: localsnapext:8006/vm-8006-disk-0.qcow2,size=1G
-scsi1: lvm-store:vm-8006-disk-0.qcow2,size=1G
+scsi0: localsnapext:8006/vol-vm-8006-disk-0.qcow2,size=1G
+scsi1: lvm-store:vol-vm-8006-disk-0.qcow2,size=1G
snaptime: 1748933042

[snap2]
parent: snap1
name: simple
-scsi0: localsnapext:8006/vm-8006-disk-0.qcow2,size=1G
-scsi1: lvm-store:vm-8006-disk-0.qcow2,size=1G
+scsi0: localsnapext:8006/vol-vm-8006-disk-0.qcow2,size=1G
+scsi1: lvm-store:vol-vm-8006-disk-0.qcow2,size=1G
snaptime: 1748933043

[snap3]
parent: snap2
name: simple
-scsi0: localsnapext:8006/vm-8006-disk-0.qcow2,size=1G
-scsi1: lvm-store:vm-8006-disk-0.qcow2,size=1G
+scsi0: localsnapext:8006/vol-vm-8006-disk-0.qcow2,size=1G
+scsi1: lvm-store:vol-vm-8006-disk-0.qcow2,size=1G
snaptime: 1748933044
diff --git a/src/test/cfg2cmd/simple-backingchain.conf.cmd b/src/test/cfg2cmd/simple-backingchain.conf.cmd
index 4ac24b93..8ae2ca7a 100644
--- a/src/test/cfg2cmd/simple-backingchain.conf.cmd
+++ b/src/test/cfg2cmd/simple-backingchain.conf.cmd
@@ -26,8 +26,8 @@
-device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-device 'lsi,id=scsihw0,bus=pci.0,addr=0x5' \
- -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"backing":{"backing":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","discard-no-unref":true,"driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vzsnapext/images/8006/snap1-vm-8006-disk-0.qcow2","node-name":"ea91a385a49a008a4735c0aec5c6749","read-only":false},"node-name":"fa91a385a49a008a4735c0aec5c6749","read-only":false},"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","discard-no-unref":true,"driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vzsnapext/images/8006/snap2-vm-8006-disk-0.qcow2","node-name":"ec0289317073959d450248d8cd7a480","read-only":false},"node-name":"fc0289317073959d450248d8cd7a480","read-only":false},"ca
che":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","discard-no-unref":true,"driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vzsnapext/images/8006/vm-8006-disk-0.qcow2","node-name":"e74f4959037afb46eddc7313c43dfdd","read-only":false},"node-name":"f74f4959037afb46eddc7313c43dfdd","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
+ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"backing":{"backing":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","discard-no-unref":true,"driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vzsnapext/images/8006/snap1-vol-vm-8006-disk-0.qcow2","node-name":"ea91a385a49a008a4735c0aec5c6749","read-only":false},"node-name":"fa91a385a49a008a4735c0aec5c6749","read-only":false},"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","discard-no-unref":true,"driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vzsnapext/images/8006/snap2-vol-vm-8006-disk-0.qcow2","node-name":"ec0289317073959d450248d8cd7a480","read-only":false},"node-name":"fc0289317073959d450248d8cd7a480","read-only":fa
lse},"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","discard-no-unref":true,"driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vzsnapext/vms/8006/vol-vm-8006-disk-0.qcow2","node-name":"e74f4959037afb46eddc7313c43dfdd","read-only":false},"node-name":"f74f4959037afb46eddc7313c43dfdd","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
-device 'scsi-hd,bus=scsihw0.0,scsi-id=0,drive=drive-scsi0,id=scsi0,device_id=drive-scsi0,write-cache=on' \
- -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"backing":{"backing":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"host_device","filename":"/dev/veegee/snap1-vm-8006-disk-0.qcow2","node-name":"e25f58d3e6e11f2065ad41253988915","read-only":false},"node-name":"f25f58d3e6e11f2065ad41253988915","read-only":false},"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"host_device","filename":"/dev/veegee/snap2-vm-8006-disk-0.qcow2","node-name":"e9415bb5e484c1e25d25063b01686fe","read-only":false},"node-name":"f9415bb5e484c1e25d25063b01686fe","read-only":false},"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore
","driver":"qcow2","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"host_device","filename":"/dev/veegee/vm-8006-disk-0.qcow2","node-name":"e87358a470ca311f94d5cc61d1eb428","read-only":false},"node-name":"f87358a470ca311f94d5cc61d1eb428","read-only":false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \
+ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"backing":{"backing":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"host_device","filename":"/dev/veegee/snap1-vol-vm-8006-disk-0.qcow2","node-name":"e25f58d3e6e11f2065ad41253988915","read-only":false},"node-name":"f25f58d3e6e11f2065ad41253988915","read-only":false},"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"host_device","filename":"/dev/veegee/snap2-vol-vm-8006-disk-0.qcow2","node-name":"e9415bb5e484c1e25d25063b01686fe","read-only":false},"node-name":"f9415bb5e484c1e25d25063b01686fe","read-only":false},"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard"
:"ignore","driver":"qcow2","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"host_device","filename":"/dev/veegee/vol-vm-8006-disk-0.qcow2","node-name":"e87358a470ca311f94d5cc61d1eb428","read-only":false},"node-name":"f87358a470ca311f94d5cc61d1eb428","read-only":false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \
-device 'scsi-hd,bus=scsihw0.0,scsi-id=1,drive=drive-scsi1,id=scsi1,device_id=drive-scsi1,write-cache=on' \
-machine 'type=pc+pve0'
diff --git a/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf b/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf
index ae71eaf6..bbb60788 100644
--- a/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf
+++ b/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf
@@ -8,7 +8,7 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858K
+scsi0: local:8006/vol-vm-8006-disk-0.qcow2,discard=on,size=104858K
scsihw: virtio-scsi-pci
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
diff --git a/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd b/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd
index 0c61d334..1c7cd183 100644
--- a/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd
+++ b/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd
@@ -26,7 +26,7 @@
-drive 'if=none,id=drive-ide2,media=cdrom,aio=io_uring' \
-device 'ide-cd,bus=ide.1,unit=0,drive=drive-ide2,id=ide2,bootindex=200' \
-device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \
- -drive 'file=/var/lib/vz/images/8006/vm-8006-disk-0.qcow2,if=none,id=drive-scsi0,discard=on,format=qcow2,cache=none,aio=io_uring,detect-zeroes=unmap' \
+ -drive 'file=/var/lib/vz/vms/8006/vol-vm-8006-disk-0.qcow2,if=none,id=drive-scsi0,discard=on,format=qcow2,cache=none,aio=io_uring,detect-zeroes=unmap' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,bootindex=100' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=A2:C0:43:77:08:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \
diff --git a/src/test/cfg2cmd/simple-btrfs.conf b/src/test/cfg2cmd/simple-btrfs.conf
index 27de3b03..c5d9503a 100644
--- a/src/test/cfg2cmd/simple-btrfs.conf
+++ b/src/test/cfg2cmd/simple-btrfs.conf
@@ -7,10 +7,10 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: btrfs-store:8006/vm-8006-disk-0.raw,discard=on,size=104858K
-scsi1: btrfs-store:8006/vm-8006-disk-0.raw,cache=writeback,discard=on,size=104858K
-scsi2: btrfs-store:8006/vm-8006-disk-0.raw,cache=writethrough,discard=on,size=104858K
-scsi3: btrfs-store:8006/vm-8006-disk-0.raw,cache=directsync,discard=on,size=104858K
+scsi0: btrfs-store:8006/vol-vm-8006-disk-0.raw,discard=on,size=104858K
+scsi1: btrfs-store:8006/vol-vm-8006-disk-0.raw,cache=writeback,discard=on,size=104858K
+scsi2: btrfs-store:8006/vol-vm-8006-disk-0.raw,cache=writethrough,discard=on,size=104858K
+scsi3: btrfs-store:8006/vol-vm-8006-disk-0.raw,cache=directsync,discard=on,size=104858K
scsihw: virtio-scsi-pci
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
diff --git a/src/test/cfg2cmd/simple-btrfs.conf.cmd b/src/test/cfg2cmd/simple-btrfs.conf.cmd
index f80421ad..12ddeead 100644
--- a/src/test/cfg2cmd/simple-btrfs.conf.cmd
+++ b/src/test/cfg2cmd/simple-btrfs.conf.cmd
@@ -31,13 +31,13 @@
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-device 'ide-cd,bus=ide.1,unit=0,id=ide2,bootindex=200' \
-device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/butter/bread/images/8006/vm-8006-disk-0/disk.raw","node-name":"e99aff0ff797aa030a22e9f580076dd","read-only":false},"node-name":"f99aff0ff797aa030a22e9f580076dd","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/butter/bread/vms/8006/vol-vm-8006-disk-0/disk.raw","node-name":"e99aff0ff797aa030a22e9f580076dd","read-only":false},"node-name":"f99aff0ff797aa030a22e9f580076dd","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,device_id=drive-scsi0,bootindex=100,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/butter/bread/images/8006/vm-8006-disk-0/disk.raw","node-name":"e7b2fd2a8c5dbfc550d9781e5df8841","read-only":false},"node-name":"f7b2fd2a8c5dbfc550d9781e5df8841","read-only":false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/butter/bread/vms/8006/vol-vm-8006-disk-0/disk.raw","node-name":"e7b2fd2a8c5dbfc550d9781e5df8841","read-only":false},"node-name":"f7b2fd2a8c5dbfc550d9781e5df8841","read-only":false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=1,drive=drive-scsi1,id=scsi1,device_id=drive-scsi1,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/butter/bread/images/8006/vm-8006-disk-0/disk.raw","node-name":"ed78b07bb04c2cbd8aedc648e885569","read-only":false},"node-name":"fd78b07bb04c2cbd8aedc648e885569","read-only":false},"node-name":"drive-scsi2","read-only":false,"throttle-group":"throttle-drive-scsi2"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/butter/bread/vms/8006/vol-vm-8006-disk-0/disk.raw","node-name":"ed78b07bb04c2cbd8aedc648e885569","read-only":false},"node-name":"fd78b07bb04c2cbd8aedc648e885569","read-only":false},"node-name":"drive-scsi2","read-only":false,"throttle-group":"throttle-drive-scsi2"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=2,drive=drive-scsi2,id=scsi2,device_id=drive-scsi2,write-cache=off' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/butter/bread/images/8006/vm-8006-disk-0/disk.raw","node-name":"e7487c01d831e2b51a5446980170ec9","read-only":false},"node-name":"f7487c01d831e2b51a5446980170ec9","read-only":false},"node-name":"drive-scsi3","read-only":false,"throttle-group":"throttle-drive-scsi3"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/butter/bread/vms/8006/vol-vm-8006-disk-0/disk.raw","node-name":"e7487c01d831e2b51a5446980170ec9","read-only":false},"node-name":"f7487c01d831e2b51a5446980170ec9","read-only":false},"node-name":"drive-scsi3","read-only":false,"throttle-group":"throttle-drive-scsi3"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=3,drive=drive-scsi3,id=scsi3,device_id=drive-scsi3,write-cache=off' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=A2:C0:43:77:08:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300' \
diff --git a/src/test/cfg2cmd/simple-cifs.conf b/src/test/cfg2cmd/simple-cifs.conf
index fe0fed81..6af966a3 100644
--- a/src/test/cfg2cmd/simple-cifs.conf
+++ b/src/test/cfg2cmd/simple-cifs.conf
@@ -2,8 +2,8 @@
ide2: none,media=cdrom
name: simple
ostype: l26
-scsi0: cifs-store:8006/vm-8006-disk-0.raw,discard=on,size=104858K
-scsi1: cifs-store:8006/vm-8006-disk-0.raw,cache=writeback,discard=on,size=104858K
-scsi2: cifs-store:8006/vm-8006-disk-0.raw,cache=writethrough,discard=on,size=104858K
-scsi3: cifs-store:8006/vm-8006-disk-0.raw,cache=directsync,discard=on,size=104858K
+scsi0: cifs-store:8006/vol-vm-8006-disk-0.raw,discard=on,size=104858K
+scsi1: cifs-store:8006/vol-vm-8006-disk-0.raw,cache=writeback,discard=on,size=104858K
+scsi2: cifs-store:8006/vol-vm-8006-disk-0.raw,cache=writethrough,discard=on,size=104858K
+scsi3: cifs-store:8006/vol-vm-8006-disk-0.raw,cache=directsync,discard=on,size=104858K
scsihw: virtio-scsi-pci
diff --git a/src/test/cfg2cmd/simple-cifs.conf.cmd b/src/test/cfg2cmd/simple-cifs.conf.cmd
index 4174d061..a3b75065 100644
--- a/src/test/cfg2cmd/simple-cifs.conf.cmd
+++ b/src/test/cfg2cmd/simple-cifs.conf.cmd
@@ -29,12 +29,12 @@
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-device 'ide-cd,bus=ide.1,unit=0,id=ide2,bootindex=200' \
-device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/mnt/pve/cifs-store/images/8006/vm-8006-disk-0.raw","node-name":"e2b3b8f2d6a23adc1aa3ecd195dbaf5","read-only":false},"node-name":"f2b3b8f2d6a23adc1aa3ecd195dbaf5","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/mnt/pve/cifs-store/vms/8006/vol-vm-8006-disk-0.raw","node-name":"e2b3b8f2d6a23adc1aa3ecd195dbaf5","read-only":false},"node-name":"f2b3b8f2d6a23adc1aa3ecd195dbaf5","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,device_id=drive-scsi0,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/mnt/pve/cifs-store/images/8006/vm-8006-disk-0.raw","node-name":"ee4d9a961200a669c1a8182632aba3e","read-only":false},"node-name":"fe4d9a961200a669c1a8182632aba3e","read-only":false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/mnt/pve/cifs-store/vms/8006/vol-vm-8006-disk-0.raw","node-name":"ee4d9a961200a669c1a8182632aba3e","read-only":false},"node-name":"fe4d9a961200a669c1a8182632aba3e","read-only":false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=1,drive=drive-scsi1,id=scsi1,device_id=drive-scsi1,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/mnt/pve/cifs-store/images/8006/vm-8006-disk-0.raw","node-name":"e6a3bf7eee1e2636cbe31f62b537b6c","read-only":false},"node-name":"f6a3bf7eee1e2636cbe31f62b537b6c","read-only":false},"node-name":"drive-scsi2","read-only":false,"throttle-group":"throttle-drive-scsi2"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/mnt/pve/cifs-store/vms/8006/vol-vm-8006-disk-0.raw","node-name":"e6a3bf7eee1e2636cbe31f62b537b6c","read-only":false},"node-name":"f6a3bf7eee1e2636cbe31f62b537b6c","read-only":false},"node-name":"drive-scsi2","read-only":false,"throttle-group":"throttle-drive-scsi2"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=2,drive=drive-scsi2,id=scsi2,device_id=drive-scsi2,write-cache=off' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/mnt/pve/cifs-store/images/8006/vm-8006-disk-0.raw","node-name":"e7042ee58e764b1296ad54014cb9a03","read-only":false},"node-name":"f7042ee58e764b1296ad54014cb9a03","read-only":false},"node-name":"drive-scsi3","read-only":false,"throttle-group":"throttle-drive-scsi3"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/mnt/pve/cifs-store/vms/8006/vol-vm-8006-disk-0.raw","node-name":"e7042ee58e764b1296ad54014cb9a03","read-only":false},"node-name":"f7042ee58e764b1296ad54014cb9a03","read-only":false},"node-name":"drive-scsi3","read-only":false,"throttle-group":"throttle-drive-scsi3"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=3,drive=drive-scsi3,id=scsi3,device_id=drive-scsi3,write-cache=off' \
-machine 'type=pc+pve0'
diff --git a/src/test/cfg2cmd/simple-lvm.conf b/src/test/cfg2cmd/simple-lvm.conf
index 4c20991b..24f08f14 100644
--- a/src/test/cfg2cmd/simple-lvm.conf
+++ b/src/test/cfg2cmd/simple-lvm.conf
@@ -1,8 +1,8 @@
# TEST: Simple test for LVM backed VM
bootdisk: scsi0
name: simple
-scsi0: lvm-store:vm-8006-disk-0,discard=on,size=104858K
-scsi1: lvm-store:vm-8006-disk-0,cache=writeback,discard=on,size=104858K
-scsi2: lvm-store:vm-8006-disk-0,cache=writethrough,discard=on,size=104858K
-scsi3: lvm-store:vm-8006-disk-0,cache=directsync,discard=on,size=104858K
+scsi0: lvm-store:vol-vm-8006-disk-0,discard=on,size=104858K
+scsi1: lvm-store:vol-vm-8006-disk-0,cache=writeback,discard=on,size=104858K
+scsi2: lvm-store:vol-vm-8006-disk-0,cache=writethrough,discard=on,size=104858K
+scsi3: lvm-store:vol-vm-8006-disk-0,cache=directsync,discard=on,size=104858K
scsihw: virtio-scsi-pci
diff --git a/src/test/cfg2cmd/simple-lvm.conf.cmd b/src/test/cfg2cmd/simple-lvm.conf.cmd
index 96248c0d..0ab09c87 100644
--- a/src/test/cfg2cmd/simple-lvm.conf.cmd
+++ b/src/test/cfg2cmd/simple-lvm.conf.cmd
@@ -28,12 +28,12 @@
-device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/veegee/vm-8006-disk-0","node-name":"e0378a375d635b0f473569544c7c207","read-only":false},"node-name":"f0378a375d635b0f473569544c7c207","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/veegee/vol-vm-8006-disk-0","node-name":"e0378a375d635b0f473569544c7c207","read-only":false},"node-name":"f0378a375d635b0f473569544c7c207","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,device_id=drive-scsi0,bootindex=100,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/veegee/vm-8006-disk-0","node-name":"e2fbae024c8a771f708f4a5391211b0","read-only":false},"node-name":"f2fbae024c8a771f708f4a5391211b0","read-only":false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/veegee/vol-vm-8006-disk-0","node-name":"e2fbae024c8a771f708f4a5391211b0","read-only":false},"node-name":"f2fbae024c8a771f708f4a5391211b0","read-only":false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=1,drive=drive-scsi1,id=scsi1,device_id=drive-scsi1,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/veegee/vm-8006-disk-0","node-name":"e4328c26b141e3efe1564cb60bf1155","read-only":false},"node-name":"f4328c26b141e3efe1564cb60bf1155","read-only":false},"node-name":"drive-scsi2","read-only":false,"throttle-group":"throttle-drive-scsi2"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/veegee/vol-vm-8006-disk-0","node-name":"e4328c26b141e3efe1564cb60bf1155","read-only":false},"node-name":"f4328c26b141e3efe1564cb60bf1155","read-only":false},"node-name":"drive-scsi2","read-only":false,"throttle-group":"throttle-drive-scsi2"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=2,drive=drive-scsi2,id=scsi2,device_id=drive-scsi2,write-cache=off' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/veegee/vm-8006-disk-0","node-name":"e68e10f8128f05fe5f7e85cc1f9922b","read-only":false},"node-name":"f68e10f8128f05fe5f7e85cc1f9922b","read-only":false},"node-name":"drive-scsi3","read-only":false,"throttle-group":"throttle-drive-scsi3"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/veegee/vol-vm-8006-disk-0","node-name":"e68e10f8128f05fe5f7e85cc1f9922b","read-only":false},"node-name":"f68e10f8128f05fe5f7e85cc1f9922b","read-only":false},"node-name":"drive-scsi3","read-only":false,"throttle-group":"throttle-drive-scsi3"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=3,drive=drive-scsi3,id=scsi3,device_id=drive-scsi3,write-cache=off' \
-machine 'type=pc+pve0'
diff --git a/src/test/cfg2cmd/simple-lvmthin.conf b/src/test/cfg2cmd/simple-lvmthin.conf
index 5d70622e..c898eebb 100644
--- a/src/test/cfg2cmd/simple-lvmthin.conf
+++ b/src/test/cfg2cmd/simple-lvmthin.conf
@@ -1,8 +1,8 @@
# TEST: Simple test for LVMthin backed VM
bootdisk: scsi0
name: simple
-scsi0: local-lvm:vm-8006-disk-0,discard=on,size=104858K
-scsi1: local-lvm:vm-8006-disk-0,cache=writeback,discard=on,size=104858K
-scsi2: local-lvm:vm-8006-disk-0,cache=writethrough,discard=on,size=104858K
-scsi3: local-lvm:vm-8006-disk-0,cache=directsync,discard=on,size=104858K
+scsi0: local-lvm:vol-vm-8006-disk-0,discard=on,size=104858K
+scsi1: local-lvm:vol-vm-8006-disk-0,cache=writeback,discard=on,size=104858K
+scsi2: local-lvm:vol-vm-8006-disk-0,cache=writethrough,discard=on,size=104858K
+scsi3: local-lvm:vol-vm-8006-disk-0,cache=directsync,discard=on,size=104858K
scsihw: virtio-scsi-pci
diff --git a/src/test/cfg2cmd/simple-lvmthin.conf.cmd b/src/test/cfg2cmd/simple-lvmthin.conf.cmd
index 9c98fffc..c4dc173d 100644
--- a/src/test/cfg2cmd/simple-lvmthin.conf.cmd
+++ b/src/test/cfg2cmd/simple-lvmthin.conf.cmd
@@ -28,12 +28,12 @@
-device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/pve/vm-8006-disk-0","node-name":"e6d87b01b7bb888b8426534a542ff1c","read-only":false},"node-name":"f6d87b01b7bb888b8426534a542ff1c","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/pve/vol-vm-8006-disk-0","node-name":"e6d87b01b7bb888b8426534a542ff1c","read-only":false},"node-name":"f6d87b01b7bb888b8426534a542ff1c","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,device_id=drive-scsi0,bootindex=100,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/pve/vm-8006-disk-0","node-name":"e96d9ece81aa4271aa2d8485184f66b","read-only":false},"node-name":"f96d9ece81aa4271aa2d8485184f66b","read-only":false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/pve/vol-vm-8006-disk-0","node-name":"e96d9ece81aa4271aa2d8485184f66b","read-only":false},"node-name":"f96d9ece81aa4271aa2d8485184f66b","read-only":false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=1,drive=drive-scsi1,id=scsi1,device_id=drive-scsi1,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/pve/vm-8006-disk-0","node-name":"e0b89788ef97beda10a850ab45897d9","read-only":false},"node-name":"f0b89788ef97beda10a850ab45897d9","read-only":false},"node-name":"drive-scsi2","read-only":false,"throttle-group":"throttle-drive-scsi2"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/pve/vol-vm-8006-disk-0","node-name":"e0b89788ef97beda10a850ab45897d9","read-only":false},"node-name":"f0b89788ef97beda10a850ab45897d9","read-only":false},"node-name":"drive-scsi2","read-only":false,"throttle-group":"throttle-drive-scsi2"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=2,drive=drive-scsi2,id=scsi2,device_id=drive-scsi2,write-cache=off' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/pve/vm-8006-disk-0","node-name":"ea7b6871af66ca3e13e95bd74570aa2","read-only":false},"node-name":"fa7b6871af66ca3e13e95bd74570aa2","read-only":false},"node-name":"drive-scsi3","read-only":false,"throttle-group":"throttle-drive-scsi3"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/pve/vol-vm-8006-disk-0","node-name":"ea7b6871af66ca3e13e95bd74570aa2","read-only":false},"node-name":"fa7b6871af66ca3e13e95bd74570aa2","read-only":false},"node-name":"drive-scsi3","read-only":false,"throttle-group":"throttle-drive-scsi3"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=3,drive=drive-scsi3,id=scsi3,device_id=drive-scsi3,write-cache=off' \
-machine 'type=pc+pve0'
diff --git a/src/test/cfg2cmd/simple-rbd.conf b/src/test/cfg2cmd/simple-rbd.conf
index 9960d72d..df092fb4 100644
--- a/src/test/cfg2cmd/simple-rbd.conf
+++ b/src/test/cfg2cmd/simple-rbd.conf
@@ -7,14 +7,14 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: rbd-store:vm-8006-disk-0,discard=on,size=104858K
-scsi1: rbd-store:vm-8006-disk-0,discard=on,cache=writeback,size=104858K
-scsi2: rbd-store:vm-8006-disk-0,discard=on,cache=writethrough,size=104858K
-scsi3: rbd-store:vm-8006-disk-0,discard=on,cache=directsync,size=104858K
-scsi4: krbd-store:vm-8006-disk-0,discard=on,size=104858K
-scsi5: krbd-store:vm-8006-disk-0,cache=writeback,discard=on,size=104858K
-scsi6: krbd-store:vm-8006-disk-0,cache=writethrough,discard=on,size=104858K
-scsi7: krbd-store:vm-8006-disk-0,cache=directsync,discard=on,size=104858K
+scsi0: rbd-store:vol-vm-8006-disk-0,discard=on,size=104858K
+scsi1: rbd-store:vol-vm-8006-disk-0,discard=on,cache=writeback,size=104858K
+scsi2: rbd-store:vol-vm-8006-disk-0,discard=on,cache=writethrough,size=104858K
+scsi3: rbd-store:vol-vm-8006-disk-0,discard=on,cache=directsync,size=104858K
+scsi4: krbd-store:vol-vm-8006-disk-0,discard=on,size=104858K
+scsi5: krbd-store:vol-vm-8006-disk-0,cache=writeback,discard=on,size=104858K
+scsi6: krbd-store:vol-vm-8006-disk-0,cache=writethrough,discard=on,size=104858K
+scsi7: krbd-store:vol-vm-8006-disk-0,cache=directsync,discard=on,size=104858K
scsihw: virtio-scsi-pci
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
diff --git a/src/test/cfg2cmd/simple-rbd.conf.cmd b/src/test/cfg2cmd/simple-rbd.conf.cmd
index b848672c..2bcb9287 100644
--- a/src/test/cfg2cmd/simple-rbd.conf.cmd
+++ b/src/test/cfg2cmd/simple-rbd.conf.cmd
@@ -35,21 +35,21 @@
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-device 'ide-cd,bus=ide.1,unit=0,id=ide2,bootindex=200' \
-device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"rbd","image":"vm-8006-disk-0","node-name":"e8e1af6f55c6a2466f178045aa79710","pool":"cpool","read-only":false,"server":[{"host":"127.0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","port":"3300"}]},"node-name":"f8e1af6f55c6a2466f178045aa79710","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"rbd","image":"vol-vm-8006-disk-0","node-name":"e8e1af6f55c6a2466f178045aa79710","pool":"cpool","read-only":false,"server":[{"host":"127.0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","port":"3300"}]},"node-name":"f8e1af6f55c6a2466f178045aa79710","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,device_id=drive-scsi0,bootindex=100,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"rbd","image":"vm-8006-disk-0","node-name":"e3990bba2ed1f48c5bb23e9f37b4cec","pool":"cpool","read-only":false,"server":[{"host":"127.0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","port":"3300"}]},"node-name":"f3990bba2ed1f48c5bb23e9f37b4cec","read-only":false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"rbd","image":"vol-vm-8006-disk-0","node-name":"e3990bba2ed1f48c5bb23e9f37b4cec","pool":"cpool","read-only":false,"server":[{"host":"127.0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","port":"3300"}]},"node-name":"f3990bba2ed1f48c5bb23e9f37b4cec","read-only":false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=1,drive=drive-scsi1,id=scsi1,device_id=drive-scsi1,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"rbd","image":"vm-8006-disk-0","node-name":"e3beccc2a8f2eacb8b5df8055a7d093","pool":"cpool","read-only":false,"server":[{"host":"127.0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","port":"3300"}]},"node-name":"f3beccc2a8f2eacb8b5df8055a7d093","read-only":false},"node-name":"drive-scsi2","read-only":false,"throttle-group":"throttle-drive-scsi2"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"rbd","image":"vol-vm-8006-disk-0","node-name":"e3beccc2a8f2eacb8b5df8055a7d093","pool":"cpool","read-only":false,"server":[{"host":"127.0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","port":"3300"}]},"node-name":"f3beccc2a8f2eacb8b5df8055a7d093","read-only":false},"node-name":"drive-scsi2","read-only":false,"throttle-group":"throttle-drive-scsi2"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=2,drive=drive-scsi2,id=scsi2,device_id=drive-scsi2,write-cache=off' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"rbd","image":"vm-8006-disk-0","node-name":"eef923d5dfcee93fbc712b03f9f21af","pool":"cpool","read-only":false,"server":[{"host":"127.0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","port":"3300"}]},"node-name":"fef923d5dfcee93fbc712b03f9f21af","read-only":false},"node-name":"drive-scsi3","read-only":false,"throttle-group":"throttle-drive-scsi3"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"rbd","image":"vol-vm-8006-disk-0","node-name":"eef923d5dfcee93fbc712b03f9f21af","pool":"cpool","read-only":false,"server":[{"host":"127.0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","port":"3300"}]},"node-name":"fef923d5dfcee93fbc712b03f9f21af","read-only":false},"node-name":"drive-scsi3","read-only":false,"throttle-group":"throttle-drive-scsi3"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=3,drive=drive-scsi3,id=scsi3,device_id=drive-scsi3,write-cache=off' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vm-8006-disk-0","node-name":"eb2c7a292f03b9f6d015cf83ae79730","read-only":false},"node-name":"fb2c7a292f03b9f6d015cf83ae79730","read-only":false},"node-name":"drive-scsi4","read-only":false,"throttle-group":"throttle-drive-scsi4"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vol-vm-8006-disk-0","node-name":"eb2c7a292f03b9f6d015cf83ae79730","read-only":false},"node-name":"fb2c7a292f03b9f6d015cf83ae79730","read-only":false},"node-name":"drive-scsi4","read-only":false,"throttle-group":"throttle-drive-scsi4"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=4,drive=drive-scsi4,id=scsi4,device_id=drive-scsi4,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vm-8006-disk-0","node-name":"e5258ec75558b1f102af1e20e677fd0","read-only":false},"node-name":"f5258ec75558b1f102af1e20e677fd0","read-only":false},"node-name":"drive-scsi5","read-only":false,"throttle-group":"throttle-drive-scsi5"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vol-vm-8006-disk-0","node-name":"e5258ec75558b1f102af1e20e677fd0","read-only":false},"node-name":"f5258ec75558b1f102af1e20e677fd0","read-only":false},"node-name":"drive-scsi5","read-only":false,"throttle-group":"throttle-drive-scsi5"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=5,drive=drive-scsi5,id=scsi5,device_id=drive-scsi5,write-cache=on' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vm-8006-disk-0","node-name":"edb33cdcea8ec3e2225509c4945227e","read-only":false},"node-name":"fdb33cdcea8ec3e2225509c4945227e","read-only":false},"node-name":"drive-scsi6","read-only":false,"throttle-group":"throttle-drive-scsi6"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vol-vm-8006-disk-0","node-name":"edb33cdcea8ec3e2225509c4945227e","read-only":false},"node-name":"fdb33cdcea8ec3e2225509c4945227e","read-only":false},"node-name":"drive-scsi6","read-only":false,"throttle-group":"throttle-drive-scsi6"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=6,drive=drive-scsi6,id=scsi6,device_id=drive-scsi6,write-cache=off' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vm-8006-disk-0","node-name":"eb0b017124a47505c97a5da052e0141","read-only":false},"node-name":"fb0b017124a47505c97a5da052e0141","read-only":false},"node-name":"drive-scsi7","read-only":false,"throttle-group":"throttle-drive-scsi7"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/cpool/vol-vm-8006-disk-0","node-name":"eb0b017124a47505c97a5da052e0141","read-only":false},"node-name":"fb0b017124a47505c97a5da052e0141","read-only":false},"node-name":"drive-scsi7","read-only":false,"throttle-group":"throttle-drive-scsi7"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=7,drive=drive-scsi7,id=scsi7,device_id=drive-scsi7,write-cache=off' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=A2:C0:43:77:08:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300' \
diff --git a/src/test/cfg2cmd/simple-virtio-blk.conf b/src/test/cfg2cmd/simple-virtio-blk.conf
index d9db7580..c5582792 100644
--- a/src/test/cfg2cmd/simple-virtio-blk.conf
+++ b/src/test/cfg2cmd/simple-virtio-blk.conf
@@ -9,5 +9,5 @@ numa: 0
ostype: l26
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
-virtio0: local:8006/vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
+virtio0: local:8006/vol-vm-8006-disk-0.qcow2,discard=on,iothread=1,size=104858K
vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8
diff --git a/src/test/cfg2cmd/simple-virtio-blk.conf.cmd b/src/test/cfg2cmd/simple-virtio-blk.conf.cmd
index a9acb0cf..6eae2c1b 100644
--- a/src/test/cfg2cmd/simple-virtio-blk.conf.cmd
+++ b/src/test/cfg2cmd/simple-virtio-blk.conf.cmd
@@ -28,7 +28,7 @@
-device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-device 'ide-cd,bus=ide.1,unit=0,id=ide2,bootindex=200' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-name":"edd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"fdd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"drive-virtio0","read-only":false,"throttle-group":"throttle-drive-virtio0"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-0.qcow2","node-name":"edd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"fdd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"drive-virtio0","read-only":false,"throttle-group":"throttle-drive-virtio0"}' \
-device 'virtio-blk-pci,drive=drive-virtio0,id=virtio0,bus=pci.0,addr=0xa,iothread=iothread-virtio0,bootindex=100,write-cache=on' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=A2:C0:43:77:08:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300' \
diff --git a/src/test/cfg2cmd/simple-zfs-over-iscsi.conf b/src/test/cfg2cmd/simple-zfs-over-iscsi.conf
index 4dbf2b7c..0e76dbb5 100644
--- a/src/test/cfg2cmd/simple-zfs-over-iscsi.conf
+++ b/src/test/cfg2cmd/simple-zfs-over-iscsi.conf
@@ -7,10 +7,10 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: zfs-over-iscsi-store:vm-8006-disk-0,discard=on,size=104858K
-scsi1: zfs-over-iscsi-store:vm-8006-disk-0,cache=writeback,discard=on,size=104858K
-scsi2: zfs-over-iscsi-store:vm-8006-disk-0,cache=writethrough,discard=on,size=104858K
-scsi3: zfs-over-iscsi-store:vm-8006-disk-0,cache=directsync,discard=on,size=104858K
+scsi0: zfs-over-iscsi-store:vol-vm-8006-disk-0,discard=on,size=104858K
+scsi1: zfs-over-iscsi-store:vol-vm-8006-disk-0,cache=writeback,discard=on,size=104858K
+scsi2: zfs-over-iscsi-store:vol-vm-8006-disk-0,cache=writethrough,discard=on,size=104858K
+scsi3: zfs-over-iscsi-store:vol-vm-8006-disk-0,cache=directsync,discard=on,size=104858K
scsihw: virtio-scsi-pci
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
diff --git a/src/test/cfg2cmd/simple1.conf b/src/test/cfg2cmd/simple1.conf
index 9feb9d26..a887e736 100644
--- a/src/test/cfg2cmd/simple1.conf
+++ b/src/test/cfg2cmd/simple1.conf
@@ -7,7 +7,7 @@ name: simple
net0: virtio=A2:C0:43:77:08:A0,bridge=vmbr0
numa: 0
ostype: l26
-scsi0: local:8006/vm-8006-disk-0.qcow2,discard=on,size=104858K
+scsi0: local:8006/vol-vm-8006-disk-0.qcow2,discard=on,size=104858K
scsihw: virtio-scsi-pci
smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465
sockets: 1
diff --git a/src/test/cfg2cmd/simple1.conf.cmd b/src/test/cfg2cmd/simple1.conf.cmd
index 49b848f2..c17d3262 100644
--- a/src/test/cfg2cmd/simple1.conf.cmd
+++ b/src/test/cfg2cmd/simple1.conf.cmd
@@ -28,7 +28,7 @@
-iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
-device 'ide-cd,bus=ide.1,unit=0,id=ide2,bootindex=200' \
-device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \
- -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-name":"ecd04be4259153b8293415fefa2a84c","read-only":false},"node-name":"fcd04be4259153b8293415fefa2a84c","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
+ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"file","filename":"/var/lib/vz/vms/8006/vol-vm-8006-disk-0.qcow2","node-name":"ecd04be4259153b8293415fefa2a84c","read-only":false},"node-name":"fcd04be4259153b8293415fefa2a84c","read-only":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \
-device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,device_id=drive-scsi0,bootindex=100,write-cache=on' \
-netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \
-device 'virtio-net-pci,mac=A2:C0:43:77:08:A0,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300' \
diff --git a/src/test/cfg2cmd/unsupported-storage-content-type.conf b/src/test/cfg2cmd/unsupported-storage-content-type.conf
index e33165a8..b2da3084 100644
--- a/src/test/cfg2cmd/unsupported-storage-content-type.conf
+++ b/src/test/cfg2cmd/unsupported-storage-content-type.conf
@@ -1,3 +1,3 @@
# TEST: Unsupported storage content type in a volume disk
# EXPECT_ERROR: storage 'noimages' does not support content-type 'images'
-scsi0: noimages:8006/vm-8006-disk-0.raw,iothread=1,size=32G
+scsi0: noimages:8006/vol-vm-8006-disk-0.raw,iothread=1,size=32G
diff --git a/src/test/parse-config-expected/cloudinit-snapshot.conf b/src/test/parse-config-expected/cloudinit-snapshot.conf
index bc01f975..b9ec855b 100644
--- a/src/test/parse-config-expected/cloudinit-snapshot.conf
+++ b/src/test/parse-config-expected/cloudinit-snapshot.conf
@@ -10,11 +10,11 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: cloudinit
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
-unused0: rbd:vm-120-disk-0
+unused0: rbd:vol-vm-120-disk-0
vmgenid: 7079e97c-50e3-4079-afe7-23e67566b946

[special:cloudinit]
@@ -32,7 +32,7 @@ meta: creation-qemu=9.0.2,ctime=1725975013
name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737549549
diff --git a/src/test/parse-config-expected/duplicate-sections.conf b/src/test/parse-config-expected/duplicate-sections.conf
index 1cb7a88a..ae6aaaa1 100644
--- a/src/test/parse-config-expected/duplicate-sections.conf
+++ b/src/test/parse-config-expected/duplicate-sections.conf
@@ -10,11 +10,11 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: foo
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
-unused0: rbd:vm-120-disk-0
+unused0: rbd:vol-vm-120-disk-0
vmgenid: 7079e97c-50e3-4079-afe7-23e67566b946

[PENDING]
@@ -35,7 +35,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737548747
diff --git a/src/test/parse-config-expected/unknown-sections.conf b/src/test/parse-config-expected/unknown-sections.conf
index 6329c33a..57e8a14f 100644
--- a/src/test/parse-config-expected/unknown-sections.conf
+++ b/src/test/parse-config-expected/unknown-sections.conf
@@ -10,11 +10,11 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: foo
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
-unused0: rbd:vm-120-disk-0
+unused0: rbd:vol-vm-120-disk-0
vmgenid: 7079e97c-50e3-4079-afe7-23e67566b946

[PENDING]
@@ -36,7 +36,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737548747
diff --git a/src/test/parse-config-expected/verify-snapshot.conf b/src/test/parse-config-expected/verify-snapshot.conf
index cd503f86..04fa1ee1 100644
--- a/src/test/parse-config-expected/verify-snapshot.conf
+++ b/src/test/parse-config-expected/verify-snapshot.conf
@@ -10,11 +10,11 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: snap
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
-unused0: rbd:vm-120-disk-0
+unused0: rbd:vol-vm-120-disk-0
vmgenid: 7079e97c-50e3-4079-afe7-23e67566b946

[snap]
@@ -28,7 +28,7 @@ meta: creation-qemu=9.0.2,ctime=1725975013
name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737549549
diff --git a/src/test/parse-config-input/cloudinit-snapshot.conf b/src/test/parse-config-input/cloudinit-snapshot.conf
index 9be05b1c..98ba017f 100644
--- a/src/test/parse-config-input/cloudinit-snapshot.conf
+++ b/src/test/parse-config-input/cloudinit-snapshot.conf
@@ -10,11 +10,11 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: cloudinit
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
-unused0: rbd:vm-120-disk-0
+unused0: rbd:vol-vm-120-disk-0
vmgenid: 7079e97c-50e3-4079-afe7-23e67566b946

[special:cloudinit]
@@ -33,7 +33,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: verify meee~ :)
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737549549
diff --git a/src/test/parse-config-input/duplicate-sections.conf b/src/test/parse-config-input/duplicate-sections.conf
index 41e90e37..064a7b33 100644
--- a/src/test/parse-config-input/duplicate-sections.conf
+++ b/src/test/parse-config-input/duplicate-sections.conf
@@ -10,11 +10,11 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: foo
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
-unused0: rbd:vm-120-disk-0
+unused0: rbd:vol-vm-120-disk-0
vmgenid: 7079e97c-50e3-4079-afe7-23e67566b946

[PENDING]
@@ -41,7 +41,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737548747
@@ -60,7 +60,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737548747
diff --git a/src/test/parse-config-input/fleecing-section.conf b/src/test/parse-config-input/fleecing-section.conf
index ee89dc56..30c65ede 100644
--- a/src/test/parse-config-input/fleecing-section.conf
+++ b/src/test/parse-config-input/fleecing-section.conf
@@ -9,11 +9,11 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
-unused0: rbd:vm-120-disk-0
+unused0: rbd:vol-vm-120-disk-0
vmgenid: 7079e97c-50e3-4079-afe7-23e67566b946

[special:fleecing]
diff --git a/src/test/parse-config-input/locked.conf b/src/test/parse-config-input/locked.conf
index 38b6e36c..610026b7 100644
--- a/src/test/parse-config-input/locked.conf
+++ b/src/test/parse-config-input/locked.conf
@@ -8,9 +8,9 @@ name: apache
net0: virtio=92:38:11:FD:ED:87,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: mydir:1422/vm-1422-disk-0.qcow2,size=4G
+scsi0: mydir:1422/vol-vm-1422-disk-0.qcow2,size=4G
scsihw: virtio-scsi-pci
smbios1: uuid=ddf91b3f-a597-42be-9a7e-fb6421dcd5cd
sockets: 1
-unused7: mydir:1422/vm-1422-disk-8.qcow2
+unused7: mydir:1422/vol-vm-1422-disk-8.qcow2
vmgenid: 0
diff --git a/src/test/parse-config-input/plain.conf b/src/test/parse-config-input/plain.conf
index 63449b9e..8e36cc5a 100644
--- a/src/test/parse-config-input/plain.conf
+++ b/src/test/parse-config-input/plain.conf
@@ -7,7 +7,7 @@ name: apache
net0: virtio=92:38:11:FD:ED:87,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: mydir:142/vm-142-disk-0.qcow2,size=4G
+scsi0: mydir:142/vol-vm-142-disk-0.qcow2,size=4G
scsihw: virtio-scsi-pci
smbios1: uuid=ddf91b3f-a597-42be-9a7e-fb6421dcd5cd
sockets: 1
diff --git a/src/test/parse-config-input/regular-vm-efi.conf b/src/test/parse-config-input/regular-vm-efi.conf
index 9d75fff2..91c9528e 100644
--- a/src/test/parse-config-input/regular-vm-efi.conf
+++ b/src/test/parse-config-input/regular-vm-efi.conf
@@ -2,14 +2,14 @@
bios: ovmf
boot: order=scsi0;ide2;net0
cores: 1
-efidisk0: mydir:139/vm-139-disk-0.qcow2,size=128K
+efidisk0: mydir:139/vol-vm-139-disk-0.qcow2,size=128K
ide2: local:iso/debian-10.6.0-amd64-netinst.iso,media=cdrom
memory: 2048
name: eficloneclone
net0: virtio=7A:6C:A5:8B:11:93,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: rbdkvm:vm-139-disk-1,size=4G
+scsi0: rbdkvm:vol-vm-139-disk-1,size=4G
scsihw: virtio-scsi-pci
smbios1: uuid=21a7e7bc-3cd2-4232-a009-a41f4ee992ae
sockets: 1
diff --git a/src/test/parse-config-input/sections.conf b/src/test/parse-config-input/sections.conf
index 6329c33a..57e8a14f 100644
--- a/src/test/parse-config-input/sections.conf
+++ b/src/test/parse-config-input/sections.conf
@@ -10,11 +10,11 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: foo
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
-unused0: rbd:vm-120-disk-0
+unused0: rbd:vol-vm-120-disk-0
vmgenid: 7079e97c-50e3-4079-afe7-23e67566b946

[PENDING]
@@ -36,7 +36,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737548747
diff --git a/src/test/parse-config-input/snapshots.conf b/src/test/parse-config-input/snapshots.conf
index 4f4f8675..a0ea59ac 100644
--- a/src/test/parse-config-input/snapshots.conf
+++ b/src/test/parse-config-input/snapshots.conf
@@ -1,7 +1,7 @@
boot: order=scsi1;ide2;net0;ide1
cores: 4
cpu: x86-64-v2-AES
-ide0: dir:111/vm-111-disk-2.qcow2,size=1G
+ide0: dir:111/vol-vm-111-disk-2.qcow2,size=1G
ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456K
ide2: sani:iso/Win2019-evaluation.iso,media=cdrom,size=4985424K
machine: pc-i440fx-9.1
@@ -13,21 +13,21 @@ net1: e1000=BC:24:11:79:D5:65,bridge=vnet0,firewall=1
numa: 0
ostype: win10
parent: win19_5_2_plus_stuff
-scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1G
-scsi1: lvmthinbig:vm-111-disk-0,iothread=1,size=32G
+scsi0: dir:111/vol-vm-111-disk-1.qcow2,iothread=1,size=1G
+scsi1: lvmthinbig:vol-vm-111-disk-0,iothread=1,size=32G
scsihw: virtio-scsi-single
smbios1: uuid=2c4a2cda-712b-44ab-8728-51f5e734b658
sockets: 1
-unused0: rbd:vm-111-disk-0
+unused0: rbd:vol-vm-111-disk-0
vga: qxl
-virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1G
+virtio0: dir:111/vol-vm-111-disk-0.qcow2,iothread=1,size=1G
vmgenid: 713da648-38a6-489e-b0b2-dd9cef419f33

[machine_version_5_1]
boot: order=ide0;ide2;net0
cores: 4
cpu: x86-64-v2-AES
-ide0: lvmthinbig:vm-111-disk-0,size=32G
+ide0: lvmthinbig:vol-vm-111-disk-0,size=32G
ide2: sani:iso/Win2016-1616-evaluation.ISO,media=cdrom,size=5198078K
memory: 4096
meta: creation-qemu=9.1.2,ctime=1736349024
@@ -45,7 +45,7 @@ vmgenid: 1f314a76-50a3-4b92-9307-c8c6e313d3ca
boot: order=ide0;ide2;net0;ide1
cores: 4
cpu: x86-64-v2-AES
-ide0: lvmthinbig:vm-111-disk-0,size=32G
+ide0: lvmthinbig:vol-vm-111-disk-0,size=32G
ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456K
ide2: sani:iso/Win2016-1616-evaluation.ISO,media=cdrom,size=5198078K
memory: 4096
@@ -55,12 +55,12 @@ net0: virtio=BC:24:11:A3:DA:B1,bridge=vnet0,firewall=1
numa: 0
ostype: win10
parent: machine_version_5_1
-scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1G
+scsi0: dir:111/vol-vm-111-disk-1.qcow2,iothread=1,size=1G
scsihw: virtio-scsi-single
smbios1: uuid=2c4a2cda-712b-44ab-8728-51f5e734b658
snaptime: 1736940462
sockets: 1
-virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1G
+virtio0: dir:111/vol-vm-111-disk-0.qcow2,iothread=1,size=1G
vmgenid: 4f602356-cb9c-45ad-a554-d76d95c7c0f8

[ovmf_machine_version_5_1]
@@ -68,8 +68,8 @@ bios: ovmf
boot: order=ide0;ide2;net0;ide1
cores: 4
cpu: x86-64-v2-AES
-efidisk0: rbd:vm-111-disk-0,efitype=4m,pre-enrolled-keys=1,size=1M
-ide0: lvmthinbig:vm-111-disk-0,size=32G
+efidisk0: rbd:vol-vm-111-disk-0,efitype=4m,pre-enrolled-keys=1,size=1M
+ide0: lvmthinbig:vol-vm-111-disk-0,size=32G
ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456K
ide2: sani:iso/Win2016-1616-evaluation.ISO,media=cdrom,size=5198078K
machine: pc-q35-5.1
@@ -80,12 +80,12 @@ net0: e1000=BC:24:11:A3:DA:B1,bridge=vnet0,firewall=1
numa: 0
ostype: win10
parent: machine_version_5_1_with_virtio
-scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1G
+scsi0: dir:111/vol-vm-111-disk-1.qcow2,iothread=1,size=1G
scsihw: virtio-scsi-single
smbios1: uuid=2c4a2cda-712b-44ab-8728-51f5e734b658
snaptime: 1736943308
sockets: 1
-virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1G
+virtio0: dir:111/vol-vm-111-disk-0.qcow2,iothread=1,size=1G
vmgenid: 4f602356-cb9c-45ad-a554-d76d95c7c0f8

[ovmf_machine_version_5_1_virtio]
@@ -93,8 +93,8 @@ bios: ovmf
boot: order=ide0;ide2;net0;ide1
cores: 4
cpu: x86-64-v2-AES
-efidisk0: rbd:vm-111-disk-0,efitype=4m,pre-enrolled-keys=1,size=1M
-ide0: lvmthinbig:vm-111-disk-0,size=32G
+efidisk0: rbd:vol-vm-111-disk-0,efitype=4m,pre-enrolled-keys=1,size=1M
+ide0: lvmthinbig:vol-vm-111-disk-0,size=32G
ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456K
ide2: sani:iso/Win2016-1616-evaluation.ISO,media=cdrom,size=5198078K
machine: pc-q35-5.1
@@ -105,12 +105,12 @@ net0: virtio=BC:24:11:A3:DA:B1,bridge=vnet0,firewall=1
numa: 0
ostype: win10
parent: ovmf_machine_version_5_1
-scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1G
+scsi0: dir:111/vol-vm-111-disk-1.qcow2,iothread=1,size=1G
scsihw: virtio-scsi-single
smbios1: uuid=2c4a2cda-712b-44ab-8728-51f5e734b658
snaptime: 1736944525
sockets: 1
-virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1G
+virtio0: dir:111/vol-vm-111-disk-0.qcow2,iothread=1,size=1G
vmgenid: 00b95468-4f34-4faa-b0af-b214ff5bbcdf

[static-network]
@@ -118,8 +118,8 @@ bios: ovmf
boot: order=ide0;ide2;net0;ide1
cores: 4
cpu: x86-64-v2-AES
-efidisk0: rbd:vm-111-disk-0,efitype=4m,pre-enrolled-keys=1,size=1M
-ide0: lvmthinbig:vm-111-disk-0,size=32G
+efidisk0: rbd:vol-vm-111-disk-0,efitype=4m,pre-enrolled-keys=1,size=1M
+ide0: lvmthinbig:vol-vm-111-disk-0,size=32G
ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456K
ide2: sani:iso/Win2016-1616-evaluation.ISO,media=cdrom,size=5198078K
machine: pc-q35-5.1
@@ -130,12 +130,12 @@ net0: virtio=BC:24:11:A3:DA:B1,bridge=vnet0,firewall=1
numa: 0
ostype: win10
parent: ovmf_machine_version_5_1_virtio
-scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1G
+scsi0: dir:111/vol-vm-111-disk-1.qcow2,iothread=1,size=1G
scsihw: virtio-scsi-single
smbios1: uuid=2c4a2cda-712b-44ab-8728-51f5e734b658
snaptime: 1736945713
sockets: 1
-virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1G
+virtio0: dir:111/vol-vm-111-disk-0.qcow2,iothread=1,size=1G
vmgenid: 5d65fc62-2cb1-4945-9641-631b37c265a5

[win19_5_2]
@@ -153,20 +153,20 @@ net1: e1000=BC:24:11:79:D5:65,bridge=vnet0,firewall=1
numa: 0
ostype: win10
parent: machine_version_5_1_with_virtio
-scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1G
-scsi1: lvmthinbig:vm-111-disk-0,iothread=1,size=32G
+scsi0: dir:111/vol-vm-111-disk-1.qcow2,iothread=1,size=1G
+scsi1: lvmthinbig:vol-vm-111-disk-0,iothread=1,size=32G
scsihw: virtio-scsi-single
smbios1: uuid=2c4a2cda-712b-44ab-8728-51f5e734b658
snaptime: 1736950690
sockets: 1
-virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1G
+virtio0: dir:111/vol-vm-111-disk-0.qcow2,iothread=1,size=1G
vmgenid: f259de06-fa08-4ff7-8ba9-b1233a726ac4

[win19_5_2_plus_stuff]
boot: order=scsi1;ide2;net0;ide1
cores: 4
cpu: x86-64-v2-AES
-ide0: dir:111/vm-111-disk-2.qcow2,size=1G
+ide0: dir:111/vol-vm-111-disk-2.qcow2,size=1G
ide1: sani:iso/virtio-win-0.1.266.iso,media=cdrom,size=707456K
ide2: sani:iso/Win2019-evaluation.iso,media=cdrom,size=4985424K
machine: pc-i440fx-5.2
@@ -178,12 +178,12 @@ net1: e1000=BC:24:11:79:D5:65,bridge=vnet0,firewall=1
numa: 0
ostype: win10
parent: win19_5_2
-scsi0: dir:111/vm-111-disk-1.qcow2,iothread=1,size=1G
-scsi1: lvmthinbig:vm-111-disk-0,iothread=1,size=32G
+scsi0: dir:111/vol-vm-111-disk-1.qcow2,iothread=1,size=1G
+scsi1: lvmthinbig:vol-vm-111-disk-0,iothread=1,size=32G
scsihw: virtio-scsi-single
smbios1: uuid=2c4a2cda-712b-44ab-8728-51f5e734b658
snaptime: 1736951300
sockets: 1
vga: qxl
-virtio0: dir:111/vm-111-disk-0.qcow2,iothread=1,size=1G
+virtio0: dir:111/vol-vm-111-disk-0.qcow2,iothread=1,size=1G
vmgenid: 713da648-38a6-489e-b0b2-dd9cef419f33
diff --git a/src/test/parse-config-input/unknown-sections.conf b/src/test/parse-config-input/unknown-sections.conf
index 0dcd5951..0c86feee 100644
--- a/src/test/parse-config-input/unknown-sections.conf
+++ b/src/test/parse-config-input/unknown-sections.conf
@@ -10,11 +10,11 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: foo
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
-unused0: rbd:vm-120-disk-0
+unused0: rbd:vol-vm-120-disk-0
vmgenid: 7079e97c-50e3-4079-afe7-23e67566b946

[special:unknown123]
@@ -45,7 +45,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737548747
diff --git a/src/test/parse-config-input/verify-snapshot.conf b/src/test/parse-config-input/verify-snapshot.conf
index 5f52272d..4ad27782 100644
--- a/src/test/parse-config-input/verify-snapshot.conf
+++ b/src/test/parse-config-input/verify-snapshot.conf
@@ -10,11 +10,11 @@ net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: 0
ostype: l26
parent: snap
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
sockets: 1
-unused0: rbd:vm-120-disk-0
+unused0: rbd:vol-vm-120-disk-0
vmgenid: 7079e97c-50e3-4079-afe7-23e67566b946

[snap]
@@ -29,7 +29,7 @@ name: deb1223
net0: vmxnet3=BC:24:11:2C:69:EC,bridge=vnet0,firewall=1
numa: verify meee~ :)
ostype: l26
-scsi0: nfs:120/vm-120-disk-0.qcow2,iothread=1,size=4G
+scsi0: nfs:120/vol-vm-120-disk-0.qcow2,iothread=1,size=4G
scsihw: virtio-scsi-single
smbios1: uuid=b3247ab1-1fe6-428e-965b-08a1b64a8746
snaptime: 1737549549
diff --git a/src/test/restore-config-expected/139.conf b/src/test/restore-config-expected/139.conf
index 94425f7e..9f47afa5 100644
--- a/src/test/restore-config-expected/139.conf
+++ b/src/test/restore-config-expected/139.conf
@@ -2,14 +2,14 @@
bios: ovmf
boot: order=scsi0;ide2;net0
cores: 1
-efidisk0: target:139/vm-139-disk-0.qcow2,size=128K
+efidisk0: target:139/vol-vm-139-disk-0.qcow2,size=128K
ide2: local:iso/debian-10.6.0-amd64-netinst.iso,media=cdrom
memory: 2048
name: eficloneclone
net0: virtio=7A:6C:A5:8B:11:93,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: target:139/vm-139-disk-1.raw,size=4G
+scsi0: target:139/vol-vm-139-disk-1.raw,size=4G
scsihw: virtio-scsi-pci
smbios1: uuid=21a7e7bc-3cd2-4232-a009-a41f4ee992ae
sockets: 1
diff --git a/src/test/restore-config-expected/142.conf b/src/test/restore-config-expected/142.conf
index ac2d2ad2..e59b40b4 100644
--- a/src/test/restore-config-expected/142.conf
+++ b/src/test/restore-config-expected/142.conf
@@ -7,7 +7,7 @@ name: apache
net0: virtio=92:38:11:FD:ED:87,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: target:142/vm-142-disk-0.qcow2,size=4G
+scsi0: target:142/vol-vm-142-disk-0.qcow2,size=4G
scsihw: virtio-scsi-pci
smbios1: uuid=ddf91b3f-a597-42be-9a7e-fb6421dcd5cd
sockets: 1
diff --git a/src/test/restore-config-expected/1422.conf b/src/test/restore-config-expected/1422.conf
index 2d77a44a..688a9b7b 100644
--- a/src/test/restore-config-expected/1422.conf
+++ b/src/test/restore-config-expected/1422.conf
@@ -7,7 +7,7 @@ name: apache
net0: virtio=92:38:11:FD:ED:87,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: target:1422/vm-1422-disk-0.qcow2,size=4G
+scsi0: target:1422/vol-vm-1422-disk-0.qcow2,size=4G
scsihw: virtio-scsi-pci
smbios1: uuid=ddf91b3f-a597-42be-9a7e-fb6421dcd5cd
sockets: 1
diff --git a/src/test/restore-config-expected/179.conf b/src/test/restore-config-expected/179.conf
index 4444efb5..6d5a7242 100644
--- a/src/test/restore-config-expected/179.conf
+++ b/src/test/restore-config-expected/179.conf
@@ -6,11 +6,11 @@ memory: 2048
net0: virtio=26:15:5B:73:3F:7C,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: target:179/vm-179-disk-0.qcow2,cache=none,discard=on,size=32G,ssd=1
-scsi1: target:179/vm-179-disk-1.qcow2,cache=writethrough,size=32G
-scsi2: target:179/vm-179-disk-2.qcow2,mbps_rd=7,mbps_wr=7,replicate=0,size=32G
-scsi3: target:179/vm-179-disk-3.vmdk,size=32G
-#scsi4: myfs:179/vm-179-disk-1.qcow2,backup=0,size=32G
+scsi0: target:179/vol-vm-179-disk-0.qcow2,cache=none,discard=on,size=32G,ssd=1
+scsi1: target:179/vol-vm-179-disk-1.qcow2,cache=writethrough,size=32G
+scsi2: target:179/vol-vm-179-disk-2.qcow2,mbps_rd=7,mbps_wr=7,replicate=0,size=32G
+scsi3: target:179/vol-vm-179-disk-3.vmdk,size=32G
+#scsi4: myfs:179/vol-vm-179-disk-1.qcow2,backup=0,size=32G
scsihw: virtio-scsi-pci
smbios1: uuid=1819ead7-a55d-4544-8d38-29ca94869a9c
sockets: 1
diff --git a/src/test/restore-config-input/139.conf b/src/test/restore-config-input/139.conf
index 5acb4d4d..b5926453 100644
--- a/src/test/restore-config-input/139.conf
+++ b/src/test/restore-config-input/139.conf
@@ -2,14 +2,14 @@
bios: ovmf
boot: order=scsi0;ide2;net0
cores: 1
-efidisk0: mydir:139/vm-139-disk-0.qcow2,size=128K
+efidisk0: mydir:139/vol-vm-139-disk-0.qcow2,size=128K
ide2: local:iso/debian-10.6.0-amd64-netinst.iso,media=cdrom
memory: 2048
name: eficloneclone
net0: virtio=7A:6C:A5:8B:11:93,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: rbdkvm:vm-139-disk-1,size=4G
+scsi0: rbdkvm:vol-vm-139-disk-1,size=4G
scsihw: virtio-scsi-pci
smbios1: uuid=21a7e7bc-3cd2-4232-a009-a41f4ee992ae
sockets: 1
diff --git a/src/test/restore-config-input/142.conf b/src/test/restore-config-input/142.conf
index f3633aaf..82c0a781 100644
--- a/src/test/restore-config-input/142.conf
+++ b/src/test/restore-config-input/142.conf
@@ -7,7 +7,7 @@ name: apache
net0: virtio=92:38:11:FD:ED:87,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: mydir:142/vm-142-disk-0.qcow2,size=4G
+scsi0: mydir:142/vol-vm-142-disk-0.qcow2,size=4G
scsihw: virtio-scsi-pci
smbios1: uuid=ddf91b3f-a597-42be-9a7e-fb6421dcd5cd
sockets: 1
diff --git a/src/test/restore-config-input/1422.conf b/src/test/restore-config-input/1422.conf
index d3155023..325ad557 100644
--- a/src/test/restore-config-input/1422.conf
+++ b/src/test/restore-config-input/1422.conf
@@ -7,8 +7,8 @@ name: apache
net0: virtio=92:38:11:FD:ED:87,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: mydir:1422/vm-1422-disk-0.qcow2,size=4G
-unused7: mydir:1422/vm-1422-disk-8.qcow2
+scsi0: mydir:1422/vol-vm-1422-disk-0.qcow2,size=4G
+unused7: mydir:1422/vol-vm-1422-disk-8.qcow2
parent: snap
lock: backup
scsihw: virtio-scsi-pci
diff --git a/src/test/restore-config-input/179.conf b/src/test/restore-config-input/179.conf
index e1ee01a5..ca3c68e6 100644
--- a/src/test/restore-config-input/179.conf
+++ b/src/test/restore-config-input/179.conf
@@ -6,11 +6,11 @@ memory: 2048
net0: virtio=26:15:5B:73:3F:7C,bridge=vmbr0,firewall=1
numa: 0
ostype: l26
-scsi0: myfs:179/vm-179-disk-4.qcow2,cache=none,discard=on,size=32G,ssd=1
-scsi1: myfs:179/vm-179-disk-0.qcow2,cache=writethrough,size=32G
-scsi2: myfs:179/vm-179-disk-2.qcow2,mbps_rd=7,mbps_wr=7,replicate=0,size=32G
-scsi3: myfs:179/vm-179-disk-3.vmdk,size=32G
-scsi4: myfs:179/vm-179-disk-1.qcow2,backup=0,size=32G
+scsi0: myfs:179/vol-vm-179-disk-4.qcow2,cache=none,discard=on,size=32G,ssd=1
+scsi1: myfs:179/vol-vm-179-disk-0.qcow2,cache=writethrough,size=32G
+scsi2: myfs:179/vol-vm-179-disk-2.qcow2,mbps_rd=7,mbps_wr=7,replicate=0,size=32G
+scsi3: myfs:179/vol-vm-179-disk-3.vmdk,size=32G
+scsi4: myfs:179/vol-vm-179-disk-1.qcow2,backup=0,size=32G
scsihw: virtio-scsi-pci
smbios1: uuid=1819ead7-a55d-4544-8d38-29ca94869a9c
sockets: 1
diff --git a/src/test/run_config2command_tests.pl b/src/test/run_config2command_tests.pl
index 0623b5c1..eee72d77 100755
--- a/src/test/run_config2command_tests.pl
+++ b/src/test/run_config2command_tests.pl
@@ -283,29 +283,29 @@ $storage_module->mock(
if ($storeid eq 'localsnapext') {
$snapshots = {
current => {
- file => 'var/lib/vzsnapext/images/8006/vm-8006-disk-0.qcow2',
+ file => 'var/lib/vzsnapext/vms/8006/vol-vm-8006-disk-0.qcow2',
parent => 'snap2',
},
snap2 => {
- file => '/var/lib/vzsnapext/images/8006/snap2-vm-8006-disk-0.qcow2',
+ file => '/var/lib/vzsnapext/images/8006/snap2-vol-vm-8006-disk-0.qcow2',
parent => 'snap1',
},
snap1 => {
- file => '/var/lib/vzsnapext/images/8006/snap1-vm-8006-disk-0.qcow2',
+ file => '/var/lib/vzsnapext/images/8006/snap1-vol-vm-8006-disk-0.qcow2',
},
};
} elsif ($storeid eq 'lvm-store') {
$snapshots = {
current => {
- file => '/dev/veegee/vm-8006-disk-0.qcow2',
+ file => '/dev/veegee/vol-vm-8006-disk-0.qcow2',
parent => 'snap2',
},
snap2 => {
- file => '/dev/veegee/snap2-vm-8006-disk-0.qcow2',
+ file => '/dev/veegee/snap2-vol-vm-8006-disk-0.qcow2',
parent => 'snap1',
},
snap1 => {
- file => '/dev/veegee/snap1-vm-8006-disk-0.qcow2',
+ file => '/dev/veegee/snap1-vol-vm-8006-disk-0.qcow2',
},
};
}
diff --git a/src/test/run_qemu_img_convert_tests.pl b/src/test/run_qemu_img_convert_tests.pl
index 3c8f09f0..2acbbef4 100755
--- a/src/test/run_qemu_img_convert_tests.pl
+++ b/src/test/run_qemu_img_convert_tests.pl
@@ -93,7 +93,7 @@ my $tests = [
{
name => 'qcow2raw',
parameters =>
- ["local:$vmid/vm-$vmid-disk-0.qcow2", "local:$vmid/vm-$vmid-disk-0.raw", 1024 * 10],
+ ["local:$vmid/vol-vm-$vmid-disk-0.qcow2", "local:$vmid/vol-vm-$vmid-disk-0.raw", 1024 * 10],
expected => [
"/usr/bin/qemu-img",
"convert",
@@ -103,14 +103,14 @@ my $tests = [
"qcow2",
"-O",
"raw",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.qcow2",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.qcow2",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "raw2qcow2",
parameters =>
- ["local:$vmid/vm-$vmid-disk-0.raw", "local:$vmid/vm-$vmid-disk-0.qcow2", 1024 * 10],
+ ["local:$vmid/vol-vm-$vmid-disk-0.raw", "local:$vmid/vol-vm-$vmid-disk-0.qcow2", 1024 * 10],
expected => [
"/usr/bin/qemu-img",
"convert",
@@ -120,14 +120,14 @@ my $tests = [
"raw",
"-O",
"qcow2",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.qcow2",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.qcow2",
],
},
{
name => "local2rbd",
parameters =>
- ["local:$vmid/vm-$vmid-disk-0.raw", "rbd-store:vm-$vmid-disk-0", 1024 * 10],
+ ["local:$vmid/vol-vm-$vmid-disk-0.raw", "rbd-store:vol-vm-$vmid-disk-0", 1024 * 10],
expected => [
"/usr/bin/qemu-img",
"convert",
@@ -137,14 +137,14 @@ my $tests = [
"raw",
"-O",
"raw",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
- "rbd:cpool/vm-$vmid-disk-0:mon_host=127.0.0.42;127.0.0.21;[\\:\\:1]:auth_supported=none",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
+ "rbd:cpool/vol-vm-$vmid-disk-0:mon_host=127.0.0.42;127.0.0.21;[\\:\\:1]:auth_supported=none",
],
},
{
name => "rbd2local",
parameters =>
- ["rbd-store:vm-$vmid-disk-0", "local:$vmid/vm-$vmid-disk-0.raw", 1024 * 10],
+ ["rbd-store:vol-vm-$vmid-disk-0", "local:$vmid/vol-vm-$vmid-disk-0.raw", 1024 * 10],
expected => [
"/usr/bin/qemu-img",
"convert",
@@ -154,14 +154,14 @@ my $tests = [
"raw",
"-O",
"raw",
- "rbd:cpool/vm-$vmid-disk-0:mon_host=127.0.0.42;127.0.0.21;[\\:\\:1]:auth_supported=none",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "rbd:cpool/vol-vm-$vmid-disk-0:mon_host=127.0.0.42;127.0.0.21;[\\:\\:1]:auth_supported=none",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "local2zos",
parameters =>
- ["local:$vmid/vm-$vmid-disk-0.raw", "zfs-over-iscsi:vm-$vmid-disk-0", 1024 * 10],
+ ["local:$vmid/vol-vm-$vmid-disk-0.raw", "zfs-over-iscsi:vol-vm-$vmid-disk-0", 1024 * 10],
expected => [
"/usr/bin/qemu-img",
"convert",
@@ -170,14 +170,14 @@ my $tests = [
"-f",
"raw",
"--target-image-opts",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
"file.driver=iscsi,file.transport=tcp,file.initiator-name=foobar,file.portal=127.0.0.1,file.target=iqn.2019-10.org.test:foobar,file.lun=1,driver=raw",
],
},
{
name => "zos2local",
parameters =>
- ["zfs-over-iscsi:vm-$vmid-disk-0", "local:$vmid/vm-$vmid-disk-0.raw", 1024 * 10],
+ ["zfs-over-iscsi:vol-vm-$vmid-disk-0", "local:$vmid/vol-vm-$vmid-disk-0.raw", 1024 * 10],
expected => [
"/usr/bin/qemu-img",
"convert",
@@ -187,13 +187,13 @@ my $tests = [
"-O",
"raw",
"file.driver=iscsi,file.transport=tcp,file.initiator-name=foobar,file.portal=127.0.0.1,file.target=iqn.2019-10.org.test:foobar,file.lun=1,driver=raw",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "zos2rbd",
parameters =>
- ["zfs-over-iscsi:vm-$vmid-disk-0", "rbd-store:vm-$vmid-disk-0", 1024 * 10],
+ ["zfs-over-iscsi:vol-vm-$vmid-disk-0", "rbd-store:vol-vm-$vmid-disk-0", 1024 * 10],
expected => [
"/usr/bin/qemu-img",
"convert",
@@ -203,13 +203,13 @@ my $tests = [
"-O",
"raw",
"file.driver=iscsi,file.transport=tcp,file.initiator-name=foobar,file.portal=127.0.0.1,file.target=iqn.2019-10.org.test:foobar,file.lun=1,driver=raw",
- "rbd:cpool/vm-$vmid-disk-0:mon_host=127.0.0.42;127.0.0.21;[\\:\\:1]:auth_supported=none",
+ "rbd:cpool/vol-vm-$vmid-disk-0:mon_host=127.0.0.42;127.0.0.21;[\\:\\:1]:auth_supported=none",
],
},
{
name => "rbd2zos",
parameters =>
- ["rbd-store:vm-$vmid-disk-0", "zfs-over-iscsi:vm-$vmid-disk-0", 1024 * 10],
+ ["rbd-store:vol-vm-$vmid-disk-0", "zfs-over-iscsi:vol-vm-$vmid-disk-0", 1024 * 10],
expected => [
"/usr/bin/qemu-img",
"convert",
@@ -218,14 +218,14 @@ my $tests = [
"-f",
"raw",
"--target-image-opts",
- "rbd:cpool/vm-$vmid-disk-0:mon_host=127.0.0.42;127.0.0.21;[\\:\\:1]:auth_supported=none",
+ "rbd:cpool/vol-vm-$vmid-disk-0:mon_host=127.0.0.42;127.0.0.21;[\\:\\:1]:auth_supported=none",
"file.driver=iscsi,file.transport=tcp,file.initiator-name=foobar,file.portal=127.0.0.1,file.target=iqn.2019-10.org.test:foobar,file.lun=1,driver=raw",
],
},
{
name => "local2lvmthin",
parameters =>
- ["local:$vmid/vm-$vmid-disk-0.raw", "local-lvm:vm-$vmid-disk-0", 1024 * 10],
+ ["local:$vmid/vol-vm-$vmid-disk-0.raw", "local-lvm:vol-vm-$vmid-disk-0", 1024 * 10],
expected => [
"/usr/bin/qemu-img",
"convert",
@@ -235,14 +235,14 @@ my $tests = [
"raw",
"-O",
"raw",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
- "/dev/pve/vm-$vmid-disk-0",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
+ "/dev/pve/vol-vm-$vmid-disk-0",
],
},
{
name => "lvmthin2local",
parameters =>
- ["local-lvm:vm-$vmid-disk-0", "local:$vmid/vm-$vmid-disk-0.raw", 1024 * 10],
+ ["local-lvm:vol-vm-$vmid-disk-0", "local:$vmid/vol-vm-$vmid-disk-0.raw", 1024 * 10],
expected => [
"/usr/bin/qemu-img",
"convert",
@@ -252,15 +252,15 @@ my $tests = [
"raw",
"-O",
"raw",
- "/dev/pve/vm-$vmid-disk-0",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/dev/pve/vol-vm-$vmid-disk-0",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "zeroinit",
parameters => [
- "local-lvm:vm-$vmid-disk-0",
- "local:$vmid/vm-$vmid-disk-0.raw",
+ "local-lvm:vol-vm-$vmid-disk-0",
+ "local:$vmid/vol-vm-$vmid-disk-0.raw",
1024 * 10,
{ 'is-zero-initialized' => 1 },
],
@@ -273,19 +273,19 @@ my $tests = [
"raw",
"-O",
"raw",
- "/dev/pve/vm-$vmid-disk-0",
- "zeroinit:/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/dev/pve/vol-vm-$vmid-disk-0",
+ "zeroinit:/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "notexistingstorage",
parameters =>
- ["local-lvm:vm-$vmid-disk-0", "not-existing:$vmid/vm-$vmid-disk-0.raw", 1024 * 10],
+ ["local-lvm:vol-vm-$vmid-disk-0", "not-existing:$vmid/vol-vm-$vmid-disk-0.raw", 1024 * 10],
expected => "storage 'not-existing' does not exist\n",
},
{
name => "vmdkfile",
- parameters => ["./test.vmdk", "local:$vmid/vm-$vmid-disk-0.raw", 1024 * 10],
+ parameters => ["./test.vmdk", "local:$vmid/vol-vm-$vmid-disk-0.raw", 1024 * 10],
expected => [
"/usr/bin/qemu-img",
"convert",
@@ -296,18 +296,18 @@ my $tests = [
"-O",
"raw",
"./test.vmdk",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "notexistingfile",
- parameters => ["/foo/bar", "local:$vmid/vm-$vmid-disk-0.raw", 1024 * 10],
+ parameters => ["/foo/bar", "local:$vmid/vol-vm-$vmid-disk-0.raw", 1024 * 10],
expected => "source '/foo/bar' is not a valid volid nor path for qemu-img convert\n",
},
{
name => "efidisk",
parameters =>
- ["/usr/share/kvm/OVMF_VARS-pure-efi.fd", "local:$vmid/vm-$vmid-disk-0.raw", 1024 * 10],
+ ["/usr/share/kvm/OVMF_VARS-pure-efi.fd", "local:$vmid/vol-vm-$vmid-disk-0.raw", 1024 * 10],
expected => [
"/usr/bin/qemu-img",
"convert",
@@ -316,13 +316,13 @@ my $tests = [
"-O",
"raw",
"/usr/share/kvm/OVMF_VARS-pure-efi.fd",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "efi2zos",
parameters =>
- ["/usr/share/kvm/OVMF_VARS-pure-efi.fd", "zfs-over-iscsi:vm-$vmid-disk-0", 1024 * 10],
+ ["/usr/share/kvm/OVMF_VARS-pure-efi.fd", "zfs-over-iscsi:vol-vm-$vmid-disk-0", 1024 * 10],
expected => [
"/usr/bin/qemu-img",
"convert",
@@ -336,8 +336,8 @@ my $tests = [
{
name => "bwlimit",
parameters => [
- "local-lvm:vm-$vmid-disk-0",
- "local:$vmid/vm-$vmid-disk-0.raw",
+ "local-lvm:vol-vm-$vmid-disk-0",
+ "local:$vmid/vol-vm-$vmid-disk-0.raw",
1024 * 10,
{ bwlimit => 1024 },
],
@@ -352,15 +352,15 @@ my $tests = [
"raw",
"-O",
"raw",
- "/dev/pve/vm-$vmid-disk-0",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/dev/pve/vol-vm-$vmid-disk-0",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "krbdsnapshot",
parameters => [
- "krbd-store:vm-$vmid-disk-0",
- "local:$vmid/vm-$vmid-disk-0.raw",
+ "krbd-store:vol-vm-$vmid-disk-0",
+ "local:$vmid/vol-vm-$vmid-disk-0.raw",
1024 * 10,
{ snapname => 'foo' },
],
@@ -373,15 +373,15 @@ my $tests = [
"raw",
"-O",
"raw",
- "/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/apool/vm-$vmid-disk-0\@foo",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a/apool/vol-vm-$vmid-disk-0\@foo",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "rbdsnapshot",
parameters => [
- "rbd-store:vm-$vmid-disk-0",
- "local:$vmid/vm-$vmid-disk-0.raw",
+ "rbd-store:vol-vm-$vmid-disk-0",
+ "local:$vmid/vol-vm-$vmid-disk-0.raw",
1024 * 10,
{ snapname => 'foo' },
],
@@ -394,15 +394,15 @@ my $tests = [
"raw",
"-O",
"raw",
- "rbd:cpool/vm-$vmid-disk-0\@foo:mon_host=127.0.0.42;127.0.0.21;[\\:\\:1]:auth_supported=none",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "rbd:cpool/vol-vm-$vmid-disk-0\@foo:mon_host=127.0.0.42;127.0.0.21;[\\:\\:1]:auth_supported=none",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "btrfs_raw_snapshots",
parameters => [
- "btrfs:$vmid/vm-$vmid-disk-0.raw",
- "local:$vmid/vm-$vmid-disk-0.raw",
+ "btrfs:$vmid/vol-vm-$vmid-disk-0.raw",
+ "local:$vmid/vol-vm-$vmid-disk-0.raw",
1024 * 10,
{ snapname => 'foo' },
],
@@ -415,15 +415,15 @@ my $tests = [
"raw",
"-O",
"raw",
- "/var/lib/btrfs/images/$vmid/vm-$vmid-disk-0\@foo/disk.raw",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/var/lib/btrfs/vms/$vmid/vol-vm-$vmid-disk-0\@foo/disk.raw",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "btrfs_qcow2_snapshots",
parameters => [
- "btrfs:$vmid/vm-$vmid-disk-0.qcow2",
- "local:$vmid/vm-$vmid-disk-0.raw",
+ "btrfs:$vmid/vol-vm-$vmid-disk-0.qcow2",
+ "local:$vmid/vol-vm-$vmid-disk-0.raw",
1024 * 10,
{ snapname => 'snap' },
],
@@ -438,15 +438,15 @@ my $tests = [
"qcow2",
"-O",
"raw",
- "/var/lib/btrfs/images/$vmid/vm-$vmid-disk-0.qcow2",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/var/lib/btrfs/vms/$vmid/vol-vm-$vmid-disk-0.qcow2",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "lvmsnapshot",
parameters => [
- "local-lvm:vm-$vmid-disk-0",
- "local:$vmid/vm-$vmid-disk-0.raw",
+ "local-lvm:vol-vm-$vmid-disk-0",
+ "local:$vmid/vol-vm-$vmid-disk-0.raw",
1024 * 10,
{ snapname => 'foo' },
],
@@ -459,15 +459,15 @@ my $tests = [
"raw",
"-O",
"raw",
- "/dev/pve/snap_vm-$vmid-disk-0_foo",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/dev/pve/snap_vol-vm-$vmid-disk-0_foo",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "qcow2snapshot",
parameters => [
- "local:$vmid/vm-$vmid-disk-0.qcow2",
- "local:$vmid/vm-$vmid-disk-0.raw",
+ "local:$vmid/vol-vm-$vmid-disk-0.qcow2",
+ "local:$vmid/vol-vm-$vmid-disk-0.raw",
1024 * 10,
{ snapname => 'snap' },
],
@@ -482,15 +482,15 @@ my $tests = [
"qcow2",
"-O",
"raw",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.qcow2",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.qcow2",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "qcow2_external_snapshot",
parameters => [
- "localsnapext:$vmid/vm-$vmid-disk-0.qcow2",
- "local:$vmid/vm-$vmid-disk-0.raw",
+ "localsnapext:$vmid/vol-vm-$vmid-disk-0.qcow2",
+ "local:$vmid/vol-vm-$vmid-disk-0.raw",
1024 * 10,
{ snapname => 'foo' },
],
@@ -503,15 +503,15 @@ my $tests = [
"qcow2",
"-O",
"raw",
- "/var/lib/vzsnapext/images/$vmid/snap-foo-vm-$vmid-disk-0.qcow2",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/var/lib/vzsnapext/images/$vmid/snap-foo-vol-vm-$vmid-disk-0.qcow2",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "lvmqcow2_external_snapshot",
parameters => [
- "lvm-store:vm-$vmid-disk-0.qcow2",
- "local:$vmid/vm-$vmid-disk-0.raw",
+ "lvm-store:vol-vm-$vmid-disk-0.qcow2",
+ "local:$vmid/vol-vm-$vmid-disk-0.raw",
1024 * 10,
{ snapname => 'foo' },
],
@@ -524,15 +524,15 @@ my $tests = [
"qcow2",
"-O",
"raw",
- "/dev/pve/snap_vm-$vmid-disk-0_foo.qcow2",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/dev/pve/snap_vol-vm-$vmid-disk-0_foo.qcow2",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
],
},
{
name => "qcow2_external_snapshot_target",
parameters => [
- "local:$vmid/vm-$vmid-disk-0.raw",
- "localsnapext:$vmid/vm-$vmid-disk-0.qcow2",
+ "local:$vmid/vol-vm-$vmid-disk-0.raw",
+ "localsnapext:$vmid/vol-vm-$vmid-disk-0.qcow2",
1024 * 10,
],
expected => [
@@ -543,15 +543,15 @@ my $tests = [
"-f",
"raw",
"--target-image-opts",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
"driver=qcow2,discard-no-unref=true,file.driver=file,"
- . "file.filename=/var/lib/vzsnapext/images/$vmid/vm-$vmid-disk-0.qcow2",
+ . "file.filename=/var/lib/vzsnapext/vms/$vmid/vol-vm-$vmid-disk-0.qcow2",
],
},
{
name => "lvmqcow2_external_snapshot_target",
parameters => [
- "local:$vmid/vm-$vmid-disk-0.raw", "lvm-store:vm-$vmid-disk-0.qcow2", 1024 * 10,
+ "local:$vmid/vol-vm-$vmid-disk-0.raw", "lvm-store:vol-vm-$vmid-disk-0.qcow2", 1024 * 10,
],
expected => [
"/usr/bin/qemu-img",
@@ -561,9 +561,9 @@ my $tests = [
"-f",
"raw",
"--target-image-opts",
- "/var/lib/vz/images/$vmid/vm-$vmid-disk-0.raw",
+ "/var/lib/vz/vms/$vmid/vol-vm-$vmid-disk-0.raw",
"driver=qcow2,discard-no-unref=true,file.driver=host_device,"
- . "file.filename=/dev/pve/vm-$vmid-disk-0.qcow2",
+ . "file.filename=/dev/pve/vol-vm-$vmid-disk-0.qcow2",
],
},
];
diff --git a/src/test/run_qemu_migrate_tests.pl b/src/test/run_qemu_migrate_tests.pl
index ed2f38ee..e9de96eb 100755
--- a/src/test/run_qemu_migrate_tests.pl
+++ b/src/test/run_qemu_migrate_tests.pl
@@ -113,7 +113,7 @@ my $vm_configs = {
105 => {
'bootdisk' => 'scsi0',
'cores' => 1,
- 'ide0' => 'local-zfs:vm-105-disk-1,size=103M',
+ 'ide0' => 'local-zfs:vol-vm-105-disk-1,size=103M',
'ide2' => 'none,media=cdrom',
'memory' => 512,
'name' => 'Copy-of-VM-newapache',
@@ -122,7 +122,7 @@ my $vm_configs = {
'ostype' => 'l26',
'parent' => 'ohsnap',
'pending' => {},
- 'scsi0' => 'local-zfs:vm-105-disk-0,size=4G',
+ 'scsi0' => 'local-zfs:vol-vm-105-disk-0,size=4G',
'scsihw' => 'virtio-scsi-pci',
'smbios1' => 'uuid=1ddfe18b-77e0-47f6-a4bd-f1761bf6d763',
'snapshots' => {
@@ -135,7 +135,7 @@ my $vm_configs = {
'net0' => 'virtio=4A:A3:E4:4C:CF:F0,bridge=vmbr0,firewall=1',
'numa' => 0,
'ostype' => 'l26',
- 'scsi0' => 'local-zfs:vm-105-disk-0,size=4G',
+ 'scsi0' => 'local-zfs:vol-vm-105-disk-0,size=4G',
'scsihw' => 'virtio-scsi-pci',
'smbios1' => 'uuid=1ddfe18b-77e0-47f6-a4bd-f1761bf6d763',
'snaptime' => 1580976924,
@@ -151,7 +151,7 @@ my $vm_configs = {
111 => {
'bootdisk' => 'scsi0',
'cores' => 1,
- 'ide0' => 'local-lvm:vm-111-disk-0,size=4096M',
+ 'ide0' => 'local-lvm:vol-vm-111-disk-0,size=4096M',
'ide2' => 'none,media=cdrom',
'memory' => 512,
'name' => 'pending-test',
@@ -159,7 +159,7 @@ my $vm_configs = {
'numa' => 0,
'ostype' => 'l26',
'pending' => {
- 'scsi0' => 'local-zfs:vm-111-disk-0,size=103M',
+ 'scsi0' => 'local-zfs:vol-vm-111-disk-0,size=103M',
},
'scsihw' => 'virtio-scsi-pci',
'snapshots' => {},
@@ -170,8 +170,8 @@ my $vm_configs = {
123 => {
'bootdisk' => 'scsi0',
'cores' => 1,
- 'scsi0' => 'zfs-alias-1:vm-123-disk-0,size=4096M',
- 'scsi1' => 'zfs-alias-2:vm-123-disk-0,size=4096M',
+ 'scsi0' => 'zfs-alias-1:vol-vm-123-disk-0,size=4096M',
+ 'scsi1' => 'zfs-alias-2:vol-vm-123-disk-0,size=4096M',
'ide2' => 'none,media=cdrom',
'memory' => 512,
'name' => 'alias-test',
@@ -196,8 +196,8 @@ my $vm_configs = {
'net0' => 'virtio=52:5D:7E:62:85:97,bridge=vmbr1',
'numa' => 1,
'ostype' => 'l26',
- 'scsi0' => 'local-lvm:vm-149-disk-0,format=raw,size=4G',
- 'scsi1' => 'local-dir:149/vm-149-disk-0.qcow2,format=qcow2,size=1G',
+ 'scsi0' => 'local-lvm:vol-vm-149-disk-0,format=raw,size=4G',
+ 'scsi1' => 'local-dir:149/vol-vm-149-disk-0.qcow2,format=qcow2,size=1G',
'scsihw' => 'virtio-scsi-pci',
'snapshots' => {},
'smbios1' => 'uuid=e980bd43-a405-42e2-b5f4-31efe6517460',
@@ -209,7 +209,7 @@ my $vm_configs = {
'arch' => 'aarch64',
'bootdisk' => 'scsi0',
'cores' => 1,
- 'efidisk0' => 'local-lvm:vm-341-disk-0',
+ 'efidisk0' => 'local-lvm:vol-vm-341-disk-0',
'ide2' => 'none,media=cdrom',
'ipconfig0' => 'ip=103.214.69.10/25,gw=103.214.69.1',
'memory' => 4096,
@@ -217,7 +217,7 @@ my $vm_configs = {
'net0' => 'virtio=4E:F1:82:6D:D7:4B,bridge=vmbr0,firewall=1,rate=10',
'numa' => 0,
'ostype' => 'l26',
- 'scsi0' => 'rbd-store:vm-341-disk-0,size=1G',
+ 'scsi0' => 'rbd-store:vol-vm-341-disk-0,size=1G',
'scsihw' => 'virtio-scsi-pci',
'snapshots' => {},
'smbios1' => 'uuid=e01e4c73-46f1-47c8-af79-288fdf6b7462',
@@ -235,7 +235,7 @@ my $vm_configs = {
'net0' => 'virtio=4E:F1:82:6D:D7:4B,bridge=vmbr0,firewall=1,rate=10',
'numa' => 0,
'ostype' => 'l26',
- 'scsi0' => 'rbd-store:vm-1033-disk-1,size=1G',
+ 'scsi0' => 'rbd-store:vol-vm-1033-disk-1,size=1G',
'scsihw' => 'virtio-scsi-pci',
'snapshots' => {},
'smbios1' => 'uuid=e01e4c73-46f1-47c8-af79-288fdf6b7462',
@@ -253,7 +253,7 @@ my $vm_configs = {
'ostype' => 'l26',
'parent' => 'snap1',
'pending' => {},
- 'scsi0' => 'local-dir:4567/vm-4567-disk-0.qcow2,size=4G',
+ 'scsi0' => 'local-dir:4567/vol-vm-4567-disk-0.qcow2,size=4G',
'scsihw' => 'virtio-scsi-pci',
'smbios1' => 'uuid=2925fdec-a066-4228-b46b-eef8662f5e74',
'snapshots' => {
@@ -268,7 +268,7 @@ my $vm_configs = {
'ostype' => 'l26',
'runningcpu' => 'kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep',
'runningmachine' => 'pc-i440fx-10.0+pve0',
- 'scsi0' => 'local-dir:4567/vm-4567-disk-0.qcow2,size=4G',
+ 'scsi0' => 'local-dir:4567/vol-vm-4567-disk-0.qcow2,size=4G',
'scsihw' => 'virtio-scsi-pci',
'smbios1' => 'uuid=2925fdec-a066-4228-b46b-eef8662f5e74',
'snaptime' => 1595928799,
@@ -289,8 +289,8 @@ my $vm_configs = {
'parent' => 'snap1',
'runningcpu' => 'kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep',
'runningmachine' => 'pc-i440fx-10.0+pve0',
- 'scsi0' => 'local-dir:4567/vm-4567-disk-0.qcow2,size=4G',
- 'scsi1' => 'local-zfs:vm-4567-disk-0,size=1G',
+ 'scsi0' => 'local-dir:4567/vol-vm-4567-disk-0.qcow2,size=4G',
+ 'scsi1' => 'local-zfs:vol-vm-4567-disk-0,size=1G',
'scsihw' => 'virtio-scsi-pci',
'smbios1' => 'uuid=2925fdec-a066-4228-b46b-eef8662f5e74',
'snaptime' => 1595928871,
@@ -302,7 +302,7 @@ my $vm_configs = {
},
'sockets' => 1,
'startup' => 'order=2',
- 'unused0' => 'local-zfs:vm-4567-disk-0',
+ 'unused0' => 'local-zfs:vol-vm-4567-disk-0',
'vmgenid' => 'e698e60c-9278-4dd9-941f-416075383f2a',
},
};
@@ -316,7 +316,7 @@ my $source_vdisks = {
'size' => 1073741824,
'used' => 335872,
'vmid' => '149',
- 'volid' => 'local-dir:149/vm-149-disk-0.qcow2',
+ 'volid' => 'local-dir:149/vol-vm-149-disk-0.qcow2',
},
{
'ctime' => 1595928898,
@@ -325,7 +325,7 @@ my $source_vdisks = {
'size' => 4294967296,
'used' => 1811664896,
'vmid' => '4567',
- 'volid' => 'local-dir:4567/vm-4567-disk-0.qcow2',
+ 'volid' => 'local-dir:4567/vol-vm-4567-disk-0.qcow2',
},
{
'ctime' => 1595928800,
@@ -352,21 +352,21 @@ my $source_vdisks = {
'format' => 'raw',
'size' => 4294967296,
'vmid' => '149',
- 'volid' => 'local-lvm:vm-149-disk-0',
+ 'volid' => 'local-lvm:vol-vm-149-disk-0',
},
{
'ctime' => '1589277334',
'format' => 'raw',
'size' => 4194304,
'vmid' => '341',
- 'volid' => 'local-lvm:vm-341-disk-0',
+ 'volid' => 'local-lvm:vol-vm-341-disk-0',
},
{
'ctime' => '1589277334',
'format' => 'raw',
'size' => 4294967296,
'vmid' => '111',
- 'volid' => 'local-lvm:vm-111-disk-0',
+ 'volid' => 'local-lvm:vol-vm-111-disk-0',
},
],
'local-zfs' => [
@@ -375,29 +375,29 @@ my $source_vdisks = {
'format' => 'raw',
'size' => 4294967296,
'vmid' => '105',
- 'volid' => 'local-zfs:vm-105-disk-0',
+ 'volid' => 'local-zfs:vol-vm-105-disk-0',
},
{
'ctime' => '1589277334',
'format' => 'raw',
'size' => 108003328,
'vmid' => '105',
- 'volid' => 'local-zfs:vm-105-disk-1',
+ 'volid' => 'local-zfs:vol-vm-105-disk-1',
},
{
'ctime' => '1589277334',
'format' => 'raw',
'size' => 108003328,
'vmid' => '111',
- 'volid' => 'local-zfs:vm-111-disk-0',
+ 'volid' => 'local-zfs:vol-vm-111-disk-0',
},
{
'format' => 'raw',
- 'name' => 'vm-4567-disk-0',
+ 'name' => 'vol-vm-4567-disk-0',
'parent' => undef,
'size' => 1073741824,
'vmid' => '4567',
- 'volid' => 'local-zfs:vm-4567-disk-0',
+ 'volid' => 'local-zfs:vol-vm-4567-disk-0',
},
],
'rbd-store' => [
@@ -406,7 +406,7 @@ my $source_vdisks = {
'format' => 'raw',
'size' => 1073741824,
'vmid' => '1033',
- 'volid' => 'rbd-store:vm-1033-disk-1',
+ 'volid' => 'rbd-store:vol-vm-1033-disk-1',
},
{
'ctime' => '1589277334',
@@ -422,7 +422,7 @@ my $source_vdisks = {
'format' => 'raw',
'size' => 4294967296,
'vmid' => '123',
- 'volid' => 'zfs-alias-1:vm-123-disk-0',
+ 'volid' => 'zfs-alias-1:vol-vm-123-disk-0',
},
],
'zfs-alias-2' => [
@@ -431,7 +431,7 @@ my $source_vdisks = {
'format' => 'raw',
'size' => 4294967296,
'vmid' => '123',
- 'volid' => 'zfs-alias-2:vm-123-disk-0',
+ 'volid' => 'zfs-alias-2:vol-vm-123-disk-0',
},
],
};
@@ -541,12 +541,12 @@ my $tests = [
expected => {
source_volids => {},
target_volids => {
- 'local-dir:341/vm-341-disk-10.raw' => 1,
+ 'local-dir:341/vol-vm-341-disk-10.raw' => 1,
},
vm_config => get_patched_config(
341,
{
- efidisk0 => 'local-dir:341/vm-341-disk-10.raw,format=raw,size=128K',
+ efidisk0 => 'local-dir:341/vol-vm-341-disk-10.raw,format=raw,size=128K',
},
),
vm_status => {
@@ -572,12 +572,12 @@ my $tests = [
expected => {
source_volids => {},
target_volids => {
- 'local-lvm:vm-341-disk-10' => 1,
+ 'local-lvm:vol-vm-341-disk-10' => 1,
},
vm_config => get_patched_config(
341,
{
- efidisk0 => 'local-lvm:vm-341-disk-10,format=raw,size=128K',
+ efidisk0 => 'local-lvm:vol-vm-341-disk-10,format=raw,size=128K',
},
),
vm_status => {
@@ -599,15 +599,15 @@ my $tests = [
'with-local-disks' => 1,
},
fail_config => {
- vdisk_alloc => 'local-dir:149/vm-149-disk-11.qcow2',
- pvesm_free => 'local-lvm:vm-149-disk-10',
+ vdisk_alloc => 'local-dir:149/vol-vm-149-disk-11.qcow2',
+ pvesm_free => 'local-lvm:vol-vm-149-disk-10',
},
expected_calls => {},
expect_die => "remote command failed with exit code",
expected => {
source_volids => local_volids_for_vm(149),
target_volids => {
- 'local-lvm:vm-149-disk-10' => 1,
+ 'local-lvm:vol-vm-149-disk-10' => 1,
},
vm_config => $vm_configs->{149},
vm_status => {
@@ -629,7 +629,7 @@ my $tests = [
'with-local-disks' => 1,
},
fail_config => {
- vdisk_alloc => 'local-lvm:vm-149-disk-10',
+ vdisk_alloc => 'local-lvm:vol-vm-149-disk-10',
},
expected_calls => {},
expect_die => "remote command failed with exit code",
@@ -654,13 +654,13 @@ my $tests = [
'with-local-disks' => 1,
},
fail_config => {
- 'vdisk_free' => 'local-lvm:vm-149-disk-0',
+ 'vdisk_free' => 'local-lvm:vol-vm-149-disk-0',
},
expected_calls => $default_expected_calls_offline,
- expect_die => "vdisk_free 'local-lvm:vm-149-disk-0' error",
+ expect_die => "vdisk_free 'local-lvm:vol-vm-149-disk-0' error",
expected => {
source_volids => {
- 'local-lvm:vm-149-disk-0' => 1,
+ 'local-lvm:vol-vm-149-disk-0' => 1,
},
target_volids => local_volids_for_vm(149),
vm_config => $vm_configs->{149},
@@ -728,7 +728,7 @@ my $tests = [
targetstorage => 'local-dir:other-dir,local-zfs:local-zfs',
},
storage_migrate_map => {
- 'local-dir:4567/vm-4567-disk-0.qcow2' => '4567/vm-4567-disk-0.qcow2',
+ 'local-dir:4567/vol-vm-4567-disk-0.qcow2' => '4567/vol-vm-4567-disk-0.qcow2',
'local-dir:4567/vm-4567-state-snap1.raw' => '4567/vm-4567-state-snap1.raw',
'local-dir:4567/vm-4567-state-snap2.raw' => '4567/vm-4567-state-snap2.raw',
},
@@ -736,23 +736,23 @@ my $tests = [
expected => {
source_volids => {},
target_volids => {
- 'other-dir:4567/vm-4567-disk-0.qcow2' => 1,
+ 'other-dir:4567/vol-vm-4567-disk-0.qcow2' => 1,
'other-dir:4567/vm-4567-state-snap1.raw' => 1,
'other-dir:4567/vm-4567-state-snap2.raw' => 1,
- 'local-zfs:vm-4567-disk-0' => 1,
+ 'local-zfs:vol-vm-4567-disk-0' => 1,
},
vm_config => get_patched_config(
4567,
{
- 'scsi0' => 'other-dir:4567/vm-4567-disk-0.qcow2,size=4G',
+ 'scsi0' => 'other-dir:4567/vol-vm-4567-disk-0.qcow2,size=4G',
snapshots => {
snap1 => {
- 'scsi0' => 'other-dir:4567/vm-4567-disk-0.qcow2,size=4G',
+ 'scsi0' => 'other-dir:4567/vol-vm-4567-disk-0.qcow2,size=4G',
'vmstate' => 'other-dir:4567/vm-4567-state-snap1.raw',
},
snap2 => {
- 'scsi0' => 'other-dir:4567/vm-4567-disk-0.qcow2,size=4G',
- 'scsi1' => 'local-zfs:vm-4567-disk-0,size=1G',
+ 'scsi0' => 'other-dir:4567/vol-vm-4567-disk-0.qcow2,size=4G',
+ 'scsi1' => 'local-zfs:vol-vm-4567-disk-0,size=1G',
'vmstate' => 'other-dir:4567/vm-4567-state-snap2.raw',
},
},
@@ -821,20 +821,20 @@ my $tests = [
scsi1 => undef,
},
storage_migrate_map => {
- 'local-dir:149/vm-149-disk-0.qcow2' => 'vm-149-disk-0',
+ 'local-dir:149/vol-vm-149-disk-0.qcow2' => 'vol-vm-149-disk-0',
},
expected_calls => $default_expected_calls_online,
expected => {
source_volids => {
- 'local-dir:149/vm-149-disk-0.qcow2' => 1,
+ 'local-dir:149/vol-vm-149-disk-0.qcow2' => 1,
},
target_volids => {
- 'local-zfs:vm-149-disk-10' => 1,
+ 'local-zfs:vol-vm-149-disk-10' => 1,
},
vm_config => get_patched_config(
149,
{
- scsi0 => 'local-zfs:vm-149-disk-10,format=raw,size=4G',
+ scsi0 => 'local-zfs:vol-vm-149-disk-10,format=raw,size=4G',
scsi1 => undef,
},
),
@@ -860,20 +860,20 @@ my $tests = [
scsi1 => undef,
},
storage_migrate_map => {
- 'local-dir:149/vm-149-disk-0.qcow2' => '149/vm-149-disk-0.qcow2',
+ 'local-dir:149/vol-vm-149-disk-0.qcow2' => '149/vol-vm-149-disk-0.qcow2',
},
expected_calls => $default_expected_calls_online,
expected => {
source_volids => {
- 'local-dir:149/vm-149-disk-0.qcow2' => 1,
+ 'local-dir:149/vol-vm-149-disk-0.qcow2' => 1,
},
target_volids => {
- 'local-lvm:vm-149-disk-10' => 1,
+ 'local-lvm:vol-vm-149-disk-10' => 1,
},
vm_config => get_patched_config(
149,
{
- scsi0 => 'local-lvm:vm-149-disk-10,format=raw,size=4G',
+ scsi0 => 'local-lvm:vol-vm-149-disk-10,format=raw,size=4G',
scsi1 => undef,
},
),
@@ -899,21 +899,21 @@ my $tests = [
targetstorage => 'local-lvm:local-zfs,local-lvm',
},
storage_migrate_map => {
- 'local-lvm:vm-149-disk-0' => 'vm-149-disk-0',
- 'local-dir:149/vm-149-disk-0.qcow2' => 'vm-149-disk-0',
+ 'local-lvm:vol-vm-149-disk-0' => 'vol-vm-149-disk-0',
+ 'local-dir:149/vol-vm-149-disk-0.qcow2' => 'vol-vm-149-disk-0',
},
expected_calls => $default_expected_calls_offline,
expected => {
source_volids => {},
target_volids => {
- 'local-zfs:vm-149-disk-0' => 1,
- 'local-lvm:vm-149-disk-0' => 1,
+ 'local-zfs:vol-vm-149-disk-0' => 1,
+ 'local-lvm:vol-vm-149-disk-0' => 1,
},
vm_config => get_patched_config(
149,
{
- scsi0 => 'local-zfs:vm-149-disk-0,format=raw,size=4G',
- scsi1 => 'local-lvm:vm-149-disk-0,format=qcow2,size=1G',
+ scsi0 => 'local-zfs:vol-vm-149-disk-0,format=raw,size=4G',
+ scsi1 => 'local-lvm:vol-vm-149-disk-0,format=qcow2,size=1G',
},
),
vm_status => {
@@ -935,21 +935,21 @@ my $tests = [
targetstorage => 'local-dir:local-zfs,local-lvm:local-dir',
},
storage_migrate_map => {
- 'local-lvm:vm-149-disk-0' => '149/vm-149-disk-0.raw',
- 'local-dir:149/vm-149-disk-0.qcow2' => 'vm-149-disk-0',
+ 'local-lvm:vol-vm-149-disk-0' => '149/vol-vm-149-disk-0.raw',
+ 'local-dir:149/vol-vm-149-disk-0.qcow2' => 'vol-vm-149-disk-0',
},
expected_calls => $default_expected_calls_offline,
expected => {
source_volids => {},
target_volids => {
- 'local-dir:149/vm-149-disk-0.raw' => 1,
- 'local-zfs:vm-149-disk-0' => 1,
+ 'local-dir:149/vol-vm-149-disk-0.raw' => 1,
+ 'local-zfs:vol-vm-149-disk-0' => 1,
},
vm_config => get_patched_config(
149,
{
- scsi0 => 'local-dir:149/vm-149-disk-0.raw,format=raw,size=4G',
- scsi1 => 'local-zfs:vm-149-disk-0,format=qcow2,size=1G',
+ scsi0 => 'local-dir:149/vol-vm-149-disk-0.raw,format=raw,size=4G',
+ scsi1 => 'local-zfs:vol-vm-149-disk-0,format=qcow2,size=1G',
},
),
vm_status => {
@@ -974,14 +974,14 @@ my $tests = [
expected => {
source_volids => {},
target_volids => {
- 'local-zfs:vm-149-disk-10' => 1,
- 'local-lvm:vm-149-disk-11' => 1,
+ 'local-zfs:vol-vm-149-disk-10' => 1,
+ 'local-lvm:vol-vm-149-disk-11' => 1,
},
vm_config => get_patched_config(
149,
{
- scsi0 => 'local-zfs:vm-149-disk-10,format=raw,size=4G',
- scsi1 => 'local-lvm:vm-149-disk-11,format=raw,size=1G',
+ scsi0 => 'local-zfs:vol-vm-149-disk-10,format=raw,size=4G',
+ scsi1 => 'local-lvm:vol-vm-149-disk-11,format=raw,size=1G',
},
),
vm_status => {
@@ -1007,14 +1007,14 @@ my $tests = [
expected => {
source_volids => {},
target_volids => {
- 'local-zfs:vm-149-disk-10' => 1,
- 'local-dir:149/vm-149-disk-11.qcow2' => 1,
+ 'local-zfs:vol-vm-149-disk-10' => 1,
+ 'local-dir:149/vol-vm-149-disk-11.qcow2' => 1,
},
vm_config => get_patched_config(
149,
{
- scsi0 => 'local-zfs:vm-149-disk-10,format=raw,size=4G',
- scsi1 => 'local-dir:149/vm-149-disk-11.qcow2,format=qcow2,size=1G',
+ scsi0 => 'local-zfs:vol-vm-149-disk-10,format=raw,size=4G',
+ scsi1 => 'local-dir:149/vol-vm-149-disk-11.qcow2,format=qcow2,size=1G',
},
),
vm_status => {
@@ -1040,14 +1040,14 @@ my $tests = [
expected => {
source_volids => {},
target_volids => {
- 'local-zfs:vm-149-disk-10' => 1,
- 'local-zfs:vm-149-disk-11' => 1,
+ 'local-zfs:vol-vm-149-disk-10' => 1,
+ 'local-zfs:vol-vm-149-disk-11' => 1,
},
vm_config => get_patched_config(
149,
{
- scsi0 => 'local-zfs:vm-149-disk-10,format=raw,size=4G',
- scsi1 => 'local-zfs:vm-149-disk-11,format=raw,size=1G',
+ scsi0 => 'local-zfs:vol-vm-149-disk-10,format=raw,size=4G',
+ scsi1 => 'local-zfs:vol-vm-149-disk-11,format=raw,size=1G',
},
),
vm_status => {
@@ -1069,20 +1069,20 @@ my $tests = [
'with-local-disks' => 1,
},
config_patch => {
- scsi0 => 'local-lvm:vm-149-disk-0,size=123T',
+ scsi0 => 'local-lvm:vol-vm-149-disk-0,size=123T',
},
expected_calls => $default_expected_calls_online,
expected => {
source_volids => {},
target_volids => {
- 'local-lvm:vm-149-disk-10' => 1,
- 'local-dir:149/vm-149-disk-11.qcow2' => 1,
+ 'local-lvm:vol-vm-149-disk-10' => 1,
+ 'local-dir:149/vol-vm-149-disk-11.qcow2' => 1,
},
vm_config => get_patched_config(
149,
{
- scsi0 => 'local-lvm:vm-149-disk-10,format=raw,size=4G',
- scsi1 => 'local-dir:149/vm-149-disk-11.qcow2,format=qcow2,size=1G',
+ scsi0 => 'local-lvm:vol-vm-149-disk-10,format=raw,size=4G',
+ scsi1 => 'local-dir:149/vol-vm-149-disk-11.qcow2,format=qcow2,size=1G',
},
),
vm_status => {
@@ -1104,20 +1104,20 @@ my $tests = [
'with-local-disks' => 1,
},
config_patch => {
- scsi0 => 'local-lvm:vm-149-disk-0',
+ scsi0 => 'local-lvm:vol-vm-149-disk-0',
},
expected_calls => $default_expected_calls_online,
expected => {
source_volids => {},
target_volids => {
- 'local-lvm:vm-149-disk-10' => 1,
- 'local-dir:149/vm-149-disk-11.qcow2' => 1,
+ 'local-lvm:vol-vm-149-disk-10' => 1,
+ 'local-dir:149/vol-vm-149-disk-11.qcow2' => 1,
},
vm_config => get_patched_config(
149,
{
- scsi0 => 'local-lvm:vm-149-disk-10,format=raw,size=4G',
- scsi1 => 'local-dir:149/vm-149-disk-11.qcow2,format=qcow2,size=1G',
+ scsi0 => 'local-lvm:vol-vm-149-disk-10,format=raw,size=4G',
+ scsi1 => 'local-dir:149/vol-vm-149-disk-11.qcow2,format=qcow2,size=1G',
},
),
vm_status => {
@@ -1536,14 +1536,14 @@ my $tests = [
expected => {
source_volids => {},
target_volids => {
- 'local-lvm:vm-149-disk-10' => 1,
- 'local-dir:149/vm-149-disk-11.qcow2' => 1,
+ 'local-lvm:vol-vm-149-disk-10' => 1,
+ 'local-dir:149/vol-vm-149-disk-11.qcow2' => 1,
},
vm_config => get_patched_config(
149,
{
- scsi0 => 'local-lvm:vm-149-disk-10,format=raw,size=4G',
- scsi1 => 'local-dir:149/vm-149-disk-11.qcow2,format=qcow2,size=1G',
+ scsi0 => 'local-lvm:vol-vm-149-disk-10,format=raw,size=4G',
+ scsi1 => 'local-dir:149/vol-vm-149-disk-11.qcow2,format=qcow2,size=1G',
},
),
vm_status => {
@@ -1593,7 +1593,7 @@ my $tests = [
},
config_patch => {
scsi1 => undef,
- unused0 => 'local-dir:149/vm-149-disk-0.qcow2',
+ unused0 => 'local-dir:149/vol-vm-149-disk-0.qcow2',
},
expected_calls => {},
expect_die => "qemu_drive_mirror_monitor 'cancel' error",
@@ -1608,7 +1608,7 @@ my $tests = [
149,
{
scsi1 => undef,
- unused0 => 'local-dir:149/vm-149-disk-0.qcow2',
+ unused0 => 'local-dir:149/vol-vm-149-disk-0.qcow2',
},
),
vm_status => {
@@ -1648,10 +1648,10 @@ my $tests = [
'with-local-disks' => 1,
},
fail_config => {
- 'storage_migrate' => 'local-lvm:vm-149-disk-0',
+ 'storage_migrate' => 'local-lvm:vol-vm-149-disk-0',
},
expected_calls => {},
- expect_die => "storage_migrate 'local-lvm:vm-149-disk-0' error",
+ expect_die => "storage_migrate 'local-lvm:vol-vm-149-disk-0' error",
expected => {
source_volids => local_volids_for_vm(149),
target_volids => {},
@@ -1677,15 +1677,15 @@ my $tests = [
expected => {
source_volids => {},
target_volids => {
- 'local-zfs:vm-111-disk-0' => 1,
- 'local-lvm:vm-111-disk-10' => 1,
+ 'local-zfs:vol-vm-111-disk-0' => 1,
+ 'local-lvm:vol-vm-111-disk-10' => 1,
},
vm_config => get_patched_config(
111,
{
- ide0 => 'local-lvm:vm-111-disk-10,format=raw,size=4G',
+ ide0 => 'local-lvm:vol-vm-111-disk-10,format=raw,size=4G',
pending => {
- scsi0 => 'local-zfs:vm-111-disk-0,size=103M',
+ scsi0 => 'local-zfs:vol-vm-111-disk-0,size=103M',
},
},
),
diff --git a/src/test/test_get_replicatable_volumes.pl b/src/test/test_get_replicatable_volumes.pl
index 6a3d0338..ab21f29d 100755
--- a/src/test/test_get_replicatable_volumes.pl
+++ b/src/test/test_get_replicatable_volumes.pl
@@ -39,7 +39,7 @@ my $storecfg = {

my $vmid = 900;

-my $rawconf = "scsi0: non-existent-store:vm-103-disk-1,size=8G\n";
+my $rawconf = "scsi0: non-existent-store:vol-vm-103-disk-1,size=8G\n";
my $conf = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $rawconf);

my $volumes;
@@ -52,7 +52,7 @@ is($@, "storage 'non-existent-store' does not exist\n", $test_name);

$test_name = "test with disk from other VM (not owner)";

-$rawconf = "scsi0: local:103/vm-103-disk-1.qcow2,size=8G\n";
+$rawconf = "scsi0: local:103/vol-vm-103-disk-1.qcow2,size=8G\n";
$conf = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $rawconf);

$volumes = PVE::QemuConfig->get_replicatable_volumes($storecfg, $vmid, $conf, 0, 0);
@@ -60,11 +60,11 @@ is_deeply($volumes, {}, $test_name);

$test_name = "test missing replicate feature";

-$rawconf = "scsi0: local:$vmid/vm-$vmid-disk-1.qcow2,size=8G\n";
+$rawconf = "scsi0: local:$vmid/vol-vm-$vmid-disk-1.qcow2,size=8G\n";
$conf = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $rawconf);

eval { $volumes = PVE::QemuConfig->get_replicatable_volumes($storecfg, $vmid, $conf, 0, 0); };
-is($@, "missing replicate feature on volume 'local:900/vm-900-disk-1.qcow2'\n", $test_name);
+is($@, "missing replicate feature on volume 'local:900/vol-vm-900-disk-1.qcow2'\n", $test_name);

$test_name = "test raw path disk with replicate enabled";

@@ -102,62 +102,62 @@ $test_name = "test hidden volid in snapshot";

$rawconf = <<__EOD__;
memory: 1024
-scsi0: local-zfs:vm-$vmid-disk-2,size=8G
+scsi0: local-zfs:vol-vm-$vmid-disk-2,size=8G
[snap1]
memory: 512
-scsi0: local-zfs:vm-$vmid-disk-1,size=8G
+scsi0: local-zfs:vol-vm-$vmid-disk-1,size=8G
__EOD__

$conf = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $rawconf);
$volumes = PVE::QemuConfig->get_replicatable_volumes($storecfg, $vmid, $conf, 0, 0);
$expect = {
- "local-zfs:vm-$vmid-disk-1" => 1,
- "local-zfs:vm-$vmid-disk-2" => 1,
+ "local-zfs:vol-vm-$vmid-disk-1" => 1,
+ "local-zfs:vol-vm-$vmid-disk-2" => 1,
};
is_deeply($volumes, $expect, $test_name);

$test_name = "test volid with different replicate setting in snapshot";
$rawconf = <<__EOD__;
memory: 1024
-scsi0: local-zfs:vm-$vmid-disk-1,size=8G,replicate=0
+scsi0: local-zfs:vol-vm-$vmid-disk-1,size=8G,replicate=0
[snap1]
memory: 512
-scsi0: local-zfs:vm-$vmid-disk-1,size=8G
+scsi0: local-zfs:vol-vm-$vmid-disk-1,size=8G
__EOD__

$conf = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $rawconf);
$volumes = PVE::QemuConfig->get_replicatable_volumes($storecfg, $vmid, $conf, 0, 0);
$expect = {
- "local-zfs:vm-$vmid-disk-1" => 1,
+ "local-zfs:vol-vm-$vmid-disk-1" => 1,
};
is_deeply($volumes, $expect, $test_name);

$test_name = "test vm with replicatable unused volumes";

$rawconf = <<__EOD__;
-scsi0: local-zfs:vm-$vmid-disk-1,size=8G
-unused1: local-zfs:vm-$vmid-disk-2
-unused5: local-zfs:vm-$vmid-disk-3
+scsi0: local-zfs:vol-vm-$vmid-disk-1,size=8G
+unused1: local-zfs:vol-vm-$vmid-disk-2
+unused5: local-zfs:vol-vm-$vmid-disk-3
__EOD__

$conf = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $rawconf);
$volumes = PVE::QemuConfig->get_replicatable_volumes($storecfg, $vmid, $conf, 0, 0);
$expect = {
- "local-zfs:vm-$vmid-disk-1" => 1,
- "local-zfs:vm-$vmid-disk-2" => 1,
- "local-zfs:vm-$vmid-disk-3" => 1,
+ "local-zfs:vol-vm-$vmid-disk-1" => 1,
+ "local-zfs:vol-vm-$vmid-disk-2" => 1,
+ "local-zfs:vol-vm-$vmid-disk-3" => 1,
};
is_deeply($volumes, $expect, $test_name);

$test_name = "test vm with non-replicatable unused volumes";
$rawconf = <<__EOD__;
-scsi0: local-zfs:vm-$vmid-disk-1,size=8G
-unused1: local:$vmid/vm-$vmid-disk-2.raw
+scsi0: local-zfs:vol-vm-$vmid-disk-1,size=8G
+unused1: local:$vmid/vol-vm-$vmid-disk-2.raw
__EOD__

$conf = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $rawconf);
eval { $volumes = PVE::QemuConfig->get_replicatable_volumes($storecfg, $vmid, $conf, 0, 0); };
-is($@, "missing replicate feature on volume 'local:900/vm-900-disk-2.raw'\n", $test_name);
+is($@, "missing replicate feature on volume 'local:900/vol-vm-900-disk-2.raw'\n", $test_name);

done_testing();
exit(0);