qemu: command: Stop formatting of 'scsi=off' for virtio-blk-pci

The property was deprecated. Don't format it based on the new capability
if the user didn't explicitly request it.

https://bugzilla.redhat.com/show_bug.cgi?id=1829550Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NMichal Privoznik <mprivozn@redhat.com>

src/qemu/qemu_command.c

@@ -1766,7 +1766,9 @@ qemuBuildDiskDeviceStr(const virDomainDef *def,
             virBufferAsprintf(&opt, ",event_idx=%s",
                               virTristateSwitchTypeToString(disk->event_idx));
         }
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SCSI)) {
+        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SCSI) &&
+            !(virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SCSI_DEFAULT_DISABLED) &&
+              disk->device != VIR_DOMAIN_DISK_DEVICE_LUN)) {
             /* if sg_io is true but the scsi option isn't supported,
              * that means it's just always on in this version of qemu.
              */

tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args

@@ -33,7 +33,7 @@ addr=0x1 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.1,addr=0x0,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.1,addr=0x0,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \

tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args

@@ -34,7 +34,7 @@ addr=0x1 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.1,addr=0x0,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.1,addr=0x0,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \

tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args

@@ -52,7 +52,7 @@ addr=0x1 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:53:45:a5,bus=pci.1,\

tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args

@@ -52,7 +52,7 @@ addr=0x1 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.1,\

tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args

@@ -33,7 +33,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 "discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x9,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x9,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\

tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args

@@ -37,7 +37,7 @@ file=/tmp/lib/domain--1-armtest/master-key.aes \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-device,scsi=off,drive=libvirt-1-format,id=virtio-disk0 \
+-device virtio-blk-device,drive=libvirt-1-format,id=virtio-disk0 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \
 -msg timestamp=on

tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args

@@ -37,7 +37,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 "node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-24-storage","backing":"libvirt-25-format"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-24-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-24-format,\
 id=virtio-disk0,bootindex=1 \
 -blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-KDE.iso",\
 "node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap"}' \
@@ -68,14 +68,14 @@ id=virtio-disk0,bootindex=1 \
 "discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-17-storage","backing":"libvirt-18-format"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-17-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-17-format,\
 id=virtio-disk1 \
 -blockdev '{"driver":"gluster","volume":"Volume1","path":"Image",\
 "server":[{"type":"inet","host":"example.org","port":"6000"}],"debug":4,\
 "node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-16-format","read-only":false,"driver":"raw",\
 "file":"libvirt-16-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-16-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-16-format,\
 id=virtio-disk2 \
 -blockdev '{"driver":"file","filename":"/tmp/image.qcow",\
 "node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap"}' \
@@ -92,13 +92,13 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 "node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-14-storage","backing":"libvirt-15-format"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-14-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-14-format,\
 id=virtio-disk3 \
 -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest11",\
 "node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-13-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=libvirt-13-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-13-format,\
 id=virtio-disk4 \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/rhel7.qcow2",\
 "node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap"}' \
@@ -159,7 +159,7 @@ id=virtio-disk4 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage","backing":"libvirt-2-format"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-1-format,\
 id=virtio-disk5 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x8 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\

tests/qemuxml2argvdata/disk-cache.x86_64-latest.args

@@ -59,7 +59,7 @@ drive=libvirt-3-format,id=scsi0-0-0,write-cache=on \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,\
 "cache":{"direct":false,"no-flush":false},"driver":"qcow2",\
 "file":"libvirt-2-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-2-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-2-format,\
 id=virtio-disk0,write-cache=off \
 -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\
 "node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\

tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args

@@ -32,7 +32,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \
 "node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-3-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-3-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-3-format,\
 id=virtio-disk0,bootindex=2 \
 -blockdev '{"driver":"file",\
 "filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso",\

tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args

@@ -35,7 +35,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \
 "file":"libvirt-2-storage"}' \
 -blockdev '{"driver":"copy-on-read","node-name":"libvirt-CoR-vda",\
 "file":"libvirt-2-format"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-CoR-vda,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-CoR-vda,\
 id=virtio-disk0,bootindex=2 \
 -blockdev '{"driver":"file",\
 "filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso",\

tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args

@@ -32,7 +32,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \
 "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,"discard":"unmap",\
 "detect-zeroes":"unmap","driver":"qcow2","file":"libvirt-2-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-2-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-2-format,\
 id=virtio-disk0,bootindex=2 \
 -blockdev '{"driver":"file",\
 "filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso",\

tests/qemuxml2argvdata/disk-discard.x86_64-latest.args

@@ -32,7 +32,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \
 "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,"discard":"unmap",\
 "driver":"qcow2","file":"libvirt-2-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-2-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-2-format,\
 id=virtio-disk0,bootindex=2 \
 -blockdev '{"driver":"file",\
 "filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso",\

tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args

@@ -33,14 +33,14 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 "node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw",\
 "file":"libvirt-3-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-3-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-3-format,\
 id=virtio-disk0,bootindex=1 \
 -blockdev '{"driver":"gluster","volume":"Volume2","path":"Image",\
 "server":[{"type":"unix","path":"/path/to/sock"}],"debug":4,\
 "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
 "file":"libvirt-2-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-2-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-2-format,\
 id=virtio-disk1 \
 -blockdev '{"driver":"gluster","volume":"Volume3","path":"Image.qcow2",\
 "server":[{"type":"inet","host":"example.org","port":"6000"},{"type":"inet",\
@@ -49,7 +49,7 @@ id=virtio-disk1 \
 "discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-1-format,\
 id=virtio-disk2 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \

tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args

@@ -33,14 +33,14 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 "discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw",\
 "file":"libvirt-4-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-4-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-4-format,\
 id=virtio-disk0,bootindex=1 \
 -blockdev '{"driver":"https","url":"https://example.org:443/test2.img",\
 "readahead":1024,"node-name":"libvirt-3-storage","auto-read-only":true,\
 "discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw",\
 "file":"libvirt-3-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-3-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-3-format,\
 id=virtio-disk1 \
 -object secret,id=libvirt-2-storage-httpcookie-secret0,\
 data=DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA,\
@@ -50,7 +50,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
 "file":"libvirt-2-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-2-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-2-format,\
 id=virtio-disk2 \
 -object secret,id=libvirt-1-storage-httpcookie-secret0,\
 data=DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA,\
@@ -61,7 +61,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-1-format,\
 id=virtio-disk3 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \

tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args

@@ -34,14 +34,14 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 "node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw",\
 "file":"libvirt-5-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-5-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-5-format,\
 id=virtio-disk0,bootindex=1 \
 -blockdev '{"driver":"iscsi","portal":"example.org:6000",\
 "target":"iqn.1992-01.com.example","lun":1,"transport":"tcp",\
 "node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw",\
 "file":"libvirt-4-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-4-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-4-format,\
 id=virtio-disk1 \
 -object secret,id=libvirt-3-storage-auth-secret0,\
 data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
@@ -52,7 +52,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 "node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw",\
 "file":"libvirt-3-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-3-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-3-format,\
 id=virtio-disk2 \
 -object secret,id=libvirt-2-storage-auth-secret0,\
 data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
@@ -63,7 +63,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
 "file":"libvirt-2-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=libvirt-2-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-2-format,\
 id=virtio-disk3 \
 -blockdev '{"driver":"iscsi","portal":"example.org:3260",\
 "target":"iqn.1992-01.com.example","lun":0,"transport":"tcp",\

tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args

@@ -33,34 +33,34 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 "discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw",\
 "file":"libvirt-5-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-5-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-5-format,\
 id=virtio-disk0,bootindex=1 \
 -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org",\
 "port":"6000"},"export":"bar","node-name":"libvirt-4-storage",\
 "auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw",\
 "file":"libvirt-4-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-4-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-4-format,\
 id=virtio-disk1 \
 -blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"6000"},\
 "node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw",\
 "file":"libvirt-3-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-3-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-3-format,\
 id=virtio-disk2 \
 -blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"6000"},\
 "export":"bar","node-name":"libvirt-2-storage","auto-read-only":true,\
 "discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
 "file":"libvirt-2-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-2-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-2-format,\
 id=virtio-disk3 \
 -blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsock"},\
 "export":"bar","node-name":"libvirt-1-storage","auto-read-only":true,\
 "discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-1-format,\
 id=virtio-disk4 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \

tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args

@@ -34,13 +34,13 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 "node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw",\
 "file":"libvirt-6-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-6-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-6-format,\
 id=virtio-disk0,bootindex=1 \
 -blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"asdf",\
 "node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw",\
 "file":"libvirt-5-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-5-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-5-format,\
 id=virtio-disk1 \
 -blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"foo",\
 "server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.org",\
@@ -48,14 +48,14 @@ id=virtio-disk1 \
 "node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw",\
 "file":"libvirt-4-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-4-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-4-format,\
 id=virtio-disk2 \
 -blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"foo",\
 "conf":"/blah/test.conf","node-name":"libvirt-3-storage","auto-read-only":true,\
 "discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw",\
 "file":"libvirt-3-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-3-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-3-format,\
 id=virtio-disk3 \
 -object secret,id=libvirt-2-storage-auth-secret0,\
 data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
@@ -68,7 +68,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 "auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
 "file":"libvirt-2-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=libvirt-2-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-2-format,\
 id=virtio-disk4 \
 -blockdev '{"driver":"rbd","pool":"pool","image":"image",\
 "server":[{"host":"::1","port":"6321"},{"host":"example.org","port":"6789"},\
@@ -77,7 +77,7 @@ id=virtio-disk4 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-1-format,\
 id=virtio-disk5 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \

tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args

@@ -38,7 +38,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 "auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
 id=virtio-disk0 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \

tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args

@@ -37,7 +37,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
 "file":"libvirt-2-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-2-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-2-format,\
 id=virtio-disk0,bootindex=1 \
 -object secret,id=libvirt-1-storage-auth-secret0,\
 data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
@@ -50,7 +50,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 "auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-1-format,\
 id=virtio-disk1 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \

tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args

@@ -38,7 +38,7 @@ dir=/etc/pki/libvirt-vxhs/dummy,,path,endpoint=client,verify-peer=yes \
 -blockdev '{"node-name":"libvirt-4-format","read-only":false,\
 "cache":{"direct":true,"no-flush":false},"driver":"raw",\
 "file":"libvirt-4-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-4-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-4-format,\
 id=virtio-disk0,bootindex=1,write-cache=on,\
 serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 \
 -object tls-creds-x509,id=objlibvirt-3-storage_tls0,\
@@ -51,7 +51,7 @@ dir=/etc/pki/libvirt-vxhs/dummy,,path,endpoint=client,verify-peer=yes \
 -blockdev '{"node-name":"libvirt-3-format","read-only":false,\
 "cache":{"direct":true,"no-flush":false},"driver":"raw",\
 "file":"libvirt-3-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-3-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-3-format,\
 id=virtio-disk1,write-cache=on,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \
 -blockdev '{"driver":"vxhs","vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc253",\
 "server":{"host":"192.168.0.3","port":"9999"},"node-name":"libvirt-2-storage",\
@@ -60,7 +60,7 @@ id=virtio-disk1,write-cache=on,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,\
 "cache":{"direct":true,"no-flush":false},"driver":"raw",\
 "file":"libvirt-2-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=libvirt-2-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-2-format,\
 id=virtio-disk2,write-cache=on,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \
 -object tls-creds-x509,id=objlibvirt-1-storage_tls0,\
 dir=/etc/pki/libvirt-nbd/dummy,,path,endpoint=client,verify-peer=yes \
@@ -71,7 +71,7 @@ dir=/etc/pki/libvirt-nbd/dummy,,path,endpoint=client,verify-peer=yes \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,\
 "cache":{"direct":true,"no-flush":false},"driver":"raw",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-1-format,\
 id=virtio-disk3,write-cache=on \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \

tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args

@@ -33,19 +33,19 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 "node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw",\
 "file":"libvirt-4-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-4-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-4-format,\
 id=virtio-disk0,bootindex=1 \
 -blockdev '{"driver":"nvme","device":"0000:01:00.0","namespace":2,\
 "node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw",\
 "file":"libvirt-3-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-3-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-3-format,\
 id=virtio-disk1 \
 -blockdev '{"driver":"nvme","device":"0000:02:00.0","namespace":1,\
 "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
 "file":"libvirt-2-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=libvirt-2-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-2-format,\
 id=virtio-disk2 \
 -object secret,id=libvirt-1-format-encryption-secret0,\
 data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
@@ -57,7 +57,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 "cache":{"direct":true,"no-flush":false},"driver":"qcow2",\
 "encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-secret0"},\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-1-format,\
 id=virtio-disk3,write-cache=on \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \

tests/qemuxml2argvdata/disk-shared.x86_64-latest.args

@@ -57,8 +57,8 @@ write-cache=on \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,\
 "cache":{"direct":true,"no-flush":false},"driver":"raw",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,share-rw=on,\
-drive=libvirt-1-format,id=virtio-disk0,write-cache=on \
+-device virtio-blk-pci,bus=pci.0,addr=0x3,share-rw=on,drive=libvirt-1-format,\
+id=virtio-disk0,write-cache=on \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \

tests/qemuxml2argvdata/disk-slices.x86_64-latest.args

@@ -32,7 +32,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 "node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw",\
 "offset":1234,"size":321,"file":"libvirt-4-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-4-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-4-format,\
 id=virtio-disk0,bootindex=1 \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img",\
 "node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
@@ -45,7 +45,7 @@ id=virtio-disk0,bootindex=1 \
 "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-2-storage","backing":"libvirt-3-format"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-2-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-2-format,\
 id=virtio-disk1 \
 -object secret,id=libvirt-1-format-encryption-secret0,\
 data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
@@ -58,7 +58,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"luks",\
 "key-secret":"libvirt-1-format-encryption-secret0",\
 "file":"libvirt-1-slice-sto"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-1-format,\
 id=virtio-disk2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\

tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args

@@ -41,7 +41,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
 "file":"libvirt-2-storage"}' \
--device virtio-blk-pci,iothread=iothread1,scsi=off,bus=pci.0,addr=0x4,\
+-device virtio-blk-pci,iothread=iothread1,bus=pci.0,addr=0x4,\
 drive=libvirt-2-format,id=virtio-disk1 \
 -blockdev '{"driver":"file",\
 "filename":"/var/lib/libvirt/images/iothrtest2.img",\

tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args

@@ -36,7 +36,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 -blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"qcow2",\
 "encrypt":{"format":"luks","key-secret":"libvirt-7-format-encryption-secret0"},\
 "file":"libvirt-7-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-7-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-7-format,\
 id=virtio-disk0,bootindex=1 \
 -object secret,id=libvirt-6-format-encryption-secret0,\
 data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
@@ -46,7 +46,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"qcow2",\
 "encrypt":{"format":"luks","key-secret":"libvirt-6-format-encryption-secret0"},\
 "file":"libvirt-6-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-6-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-6-format,\
 id=virtio-disk1 \
 -object secret,id=libvirt-5-storage-auth-secret0,\
 data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
@@ -61,7 +61,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"qcow2",\
 "encrypt":{"format":"luks","key-secret":"libvirt-5-format-encryption-secret0"},\
 "file":"libvirt-5-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-5-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-5-format,\
 id=virtio-disk2 \
 -object secret,id=libvirt-4-format-encryption-secret0,\
 data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
@@ -72,7 +72,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"qcow2",\
 "encrypt":{"format":"luks","key-secret":"libvirt-4-format-encryption-secret0"},\
 "file":"libvirt-4-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=libvirt-4-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-4-format,\
 id=virtio-disk3 \
 -object secret,id=libvirt-3-format-encryption-secret0,\
 data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
@@ -84,7 +84,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qcow2",\
 "encrypt":{"format":"luks","key-secret":"libvirt-3-format-encryption-secret0"},\
 "file":"libvirt-3-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=libvirt-3-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-3-format,\
 id=virtio-disk4 \
 -object secret,id=libvirt-2-format-encryption-secret0,\
 data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
@@ -102,7 +102,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-secret0"},\
 "file":"libvirt-1-storage","backing":"libvirt-2-format"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x8,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x8,drive=libvirt-1-format,\
 id=virtio-disk5 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\

tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args

@@ -31,7 +31,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \

tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args

@@ -31,7 +31,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \

tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args

@@ -31,7 +31,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \

tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args

@@ -31,7 +31,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \

tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args

@@ -31,7 +31,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \

tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args

@@ -31,7 +31,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \

tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args

@@ -31,7 +31,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:a2:44:92,bus=pci.0,\

tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args

@@ -32,7 +32,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.0,\

tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args

@@ -39,7 +39,7 @@ addr=0x1 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.1,\

tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args

@@ -39,7 +39,7 @@ addr=0x1 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.1,\

tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args

@@ -38,7 +38,7 @@ addr=0x1 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -chardev socket,id=chr-vu-fs0,path=/tmp/lib/domain--1-guest/fs0.vhost-fs.sock \
 -device vhost-user-fs-pci,chardev=chr-vu-fs0,tag=mount_tag,bus=pci.1,addr=0x0 \

tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args

@@ -47,7 +47,7 @@ addr=0x0 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci-non-transitional,scsi=off,bus=pci.5,addr=0x0,\
+-device virtio-blk-pci-non-transitional,bus=pci.5,addr=0x0,\
 drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/fs1 \
 -device virtio-9p-pci-non-transitional,id=fs0,fsdev=fsdev-fs0,mount_tag=fs1,\

tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args

@@ -32,14 +32,14 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
 "file":"libvirt-2-storage"}' \
--device virtio-blk-pci,scsi=off,ats=on,bus=pci.0,addr=0x2,\
-drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \
+-device virtio-blk-pci,ats=on,bus=pci.0,addr=0x2,drive=libvirt-2-format,\
+id=virtio-disk0,bootindex=1 \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2",\
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,ats=off,bus=pci.0,addr=0x3,\
-drive=libvirt-1-format,id=virtio-disk1 \
+-device virtio-blk-pci,ats=off,bus=pci.0,addr=0x3,drive=libvirt-1-format,\
+id=virtio-disk1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \

tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args

@@ -32,13 +32,13 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
 "file":"libvirt-2-storage"}' \
--device virtio-blk-pci,scsi=off,iommu_platform=on,bus=pci.0,addr=0x2,\
+-device virtio-blk-pci,iommu_platform=on,bus=pci.0,addr=0x2,\
 drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2",\
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,iommu_platform=off,bus=pci.0,addr=0x3,\
+-device virtio-blk-pci,iommu_platform=off,bus=pci.0,addr=0x3,\
 drive=libvirt-1-format,id=virtio-disk1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\

tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args

@@ -32,14 +32,14 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
 "file":"libvirt-2-storage"}' \
--device virtio-blk-pci,scsi=off,packed=on,bus=pci.0,addr=0x2,\
-drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \
+-device virtio-blk-pci,packed=on,bus=pci.0,addr=0x2,drive=libvirt-2-format,\
+id=virtio-disk0,bootindex=1 \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2",\
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,packed=off,bus=pci.0,addr=0x3,\
-drive=libvirt-1-format,id=virtio-disk1 \
+-device virtio-blk-pci,packed=off,bus=pci.0,addr=0x3,drive=libvirt-1-format,\
+id=virtio-disk1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \

tests/qemuxml2argvdata/virtio-options.x86_64-latest.args

@@ -36,8 +36,8 @@ bus=pci.0,addr=0x9 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,iommu_platform=on,ats=on,packed=on,bus=pci.0,\
-addr=0xa,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
+-device virtio-blk-pci,iommu_platform=on,ats=on,packed=on,bus=pci.0,addr=0xa,\
+drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/fs1 \
 -device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=fs1,iommu_platform=on,\
 ats=on,packed=on,bus=pci.0,addr=0x3 \

tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args

@@ -37,8 +37,8 @@ addr=0x1 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci-transitional,scsi=off,bus=pci.2,addr=0x5,\
-drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
+-device virtio-blk-pci-transitional,bus=pci.2,addr=0x5,drive=libvirt-1-format,\
+id=virtio-disk0,bootindex=1 \
 -fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/fs1 \
 -device virtio-9p-pci-transitional,id=fs0,fsdev=fsdev-fs0,mount_tag=fs1,\
 bus=pci.2,addr=0x1 \

tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args

@@ -31,7 +31,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\

tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args

@@ -36,7 +36,7 @@ addr=0x1 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.2,addr=0x0,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.2,addr=0x0,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.3,addr=0x0 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\

tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args

@@ -31,7 +31,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\

tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args

@@ -36,7 +36,7 @@ addr=0x1 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.2,addr=0x0,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.2,addr=0x0,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.3,addr=0x0 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\

tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args

@@ -35,7 +35,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:4c:e3:86,bus=pci.0,\

tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args

@@ -36,7 +36,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.0,\

tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args

@@ -43,7 +43,7 @@ multifunction=on,addr=0x2 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:d2:70:0b,bus=pci.1,\

tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args

@@ -44,7 +44,7 @@ addr=0x1 \
 "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
 "file":"libvirt-1-storage"}' \
--device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
+-device virtio-blk-pci,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
 id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.1,\