8:42 a.m.
Nobody should use format detection due to security implications. The
result of the change is that 'raw' format will be printed unless
specified explicitly.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml | 2 +-
tests/qemuxml2argvdata/hugepages-memaccess.xml | 1 +
tests/qemuxml2argvdata/hugepages-memaccess2.xml | 1 +
tests/qemuxml2argvdata/hugepages-pages4.xml | 1 +
tests/qemuxml2argvdata/hugepages-pages5.xml | 1 +
tests/qemuxml2argvdata/hugepages-pages6.xml | 1 +
tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml | 1 +
tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml | 1 +
tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml | 1 +
tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml | 1 +
tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml | 1 +
tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml | 1 +
tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml | 1 +
tests/qemuxml2xmloutdata/autoindex.xml | 1 +
tests/qemuxml2xmloutdata/balloon-device-auto.xml | 1 +
tests/qemuxml2xmloutdata/balloon-device-period.xml | 1 +
tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml | 1 +
tests/qemuxml2xmloutdata/bios-nvram.xml | 1 +
tests/qemuxml2xmloutdata/blkiotune-device.xml | 1 +
tests/qemuxml2xmloutdata/blkiotune.xml | 1 +
tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml | 1 +
tests/qemuxml2xmloutdata/boot-menu-disable.xml | 1 +
tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml | 1 +
tests/qemuxml2xmloutdata/boot-multi.xml | 1 +
tests/qemuxml2xmloutdata/boot-order.xml | 2 ++
tests/qemuxml2xmloutdata/channel-guestfwd.xml | 1 +
tests/qemuxml2xmloutdata/channel-virtio-auto.xml | 1 +
tests/qemuxml2xmloutdata/channel-virtio-state-active.xml | 1 +
tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml | 1 +
tests/qemuxml2xmloutdata/channel-virtio.xml | 1 +
tests/qemuxml2xmloutdata/clock-catchup.xml | 1 +
tests/qemuxml2xmloutdata/console-compat-auto.xml | 1 +
tests/qemuxml2xmloutdata/console-virtio-many.xml | 1 +
tests/qemuxml2xmloutdata/console-virtio.xml | 1 +
tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml | 1 +
tests/qemuxml2xmloutdata/cputune-iothreads.xml | 1 +
tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml | 1 +
tests/qemuxml2xmloutdata/cputune-iothreadsched.xml | 1 +
tests/qemuxml2xmloutdata/cputune-zero-shares.xml | 1 +
tests/qemuxml2xmloutdata/cputune.xml | 1 +
tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml | 2 +-
tests/qemuxml2xmloutdata/disk-drive-discard.xml | 2 +-
tests/qemuxml2xmloutdata/disk-mirror-active.xml | 5 +++++
tests/qemuxml2xmloutdata/disk-mirror-inactive.xml | 4 ++++
tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml | 4 ++++
tests/qemuxml2xmloutdata/disk-mirror-old.xml | 7 ++++++-
tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml | 2 ++
tests/qemuxml2xmloutdata/disk-scsi-device.xml | 2 ++
tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml | 2 ++
tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml | 2 ++
tests/qemuxml2xmloutdata/disk-scsi-megasas.xml | 2 ++
tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml | 2 ++
tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml | 2 ++
tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml | 2 ++
tests/qemuxml2xmloutdata/disk-serial.xml | 3 +++
tests/qemuxml2xmloutdata/disk-source-pool-mode.xml | 4 ++++
tests/qemuxml2xmloutdata/disk-source-pool.xml | 2 ++
tests/qemuxml2xmloutdata/disk-usb-device.xml | 2 ++
tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml | 1 +
tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml | 1 +
tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml | 1 +
tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml | 1 +
tests/qemuxml2xmloutdata/graphics-listen-network.xml | 1 +
tests/qemuxml2xmloutdata/graphics-listen-network2.xml | 1 +
tests/qemuxml2xmloutdata/graphics-spice-compression.xml | 1 +
tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml | 1 +
tests/qemuxml2xmloutdata/graphics-spice.xml | 1 +
tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml | 1 +
tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml | 1 +
tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml | 1 +
tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml | 1 +
tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 1 +
tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml | 1 +
tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml | 1 +
tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml | 1 +
tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml | 1 +
tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml | 1 +
tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml | 1 +
tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml | 1 +
tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml | 1 +
tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml | 1 +
tests/qemuxml2xmloutdata/hostdev-vfio.xml | 1 +
tests/qemuxml2xmloutdata/hugepages-pages.xml | 1 +
tests/qemuxml2xmloutdata/hugepages-pages2.xml | 1 +
tests/qemuxml2xmloutdata/hugepages-pages3.xml | 1 +
tests/qemuxml2xmloutdata/hugepages-shared.xml | 1 +
tests/qemuxml2xmloutdata/hugepages.xml | 1 +
tests/qemuxml2xmloutdata/lease.xml | 2 ++
.../machine-loadparm-multiple-disks-nets-s390.xml | 2 ++
tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml | 1 +
tests/qemuxml2xmloutdata/memory-hotplug.xml | 1 +
tests/qemuxml2xmloutdata/memtune-unlimited.xml | 1 +
tests/qemuxml2xmloutdata/memtune.xml | 1 +
tests/qemuxml2xmloutdata/metadata-duplicate.xml | 1 +
tests/qemuxml2xmloutdata/metadata.xml | 1 +
tests/qemuxml2xmloutdata/minimal.xml | 1 +
tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 1 +
tests/qemuxml2xmloutdata/net-hostdev.xml | 1 +
tests/qemuxml2xmloutdata/net-midonet.xml | 1 +
tests/qemuxml2xmloutdata/net-openvswitch.xml | 1 +
tests/qemuxml2xmloutdata/net-udp.xml | 1 +
tests/qemuxml2xmloutdata/net-virtio-device.xml | 1 +
tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml | 1 +
tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml | 1 +
tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml | 1 +
tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml | 1 +
.../numad-auto-memory-vcpu-no-cpuset-and-placement.xml | 1 +
tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml | 1 +
tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml | 1 +
tests/qemuxml2xmloutdata/panic-isa.xml | 1 +
tests/qemuxml2xmloutdata/panic-no-address.xml | 1 +
tests/qemuxml2xmloutdata/panic.xml | 1 +
tests/qemuxml2xmloutdata/pci-rom.xml | 1 +
tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml | 1 +
tests/qemuxml2xmloutdata/pcie-expander-bus.xml | 1 +
tests/qemuxml2xmloutdata/pcie-root-port.xml | 1 +
tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml | 1 +
tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml | 1 +
tests/qemuxml2xmloutdata/pcihole64-q35.xml | 1 +
tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml | 1 +
tests/qemuxml2xmloutdata/q35-pcie.xml | 1 +
tests/qemuxml2xmloutdata/q35-usb2-multi.xml | 1 +
tests/qemuxml2xmloutdata/q35-usb2-reorder.xml | 1 +
tests/qemuxml2xmloutdata/q35-usb2.xml | 1 +
tests/qemuxml2xmloutdata/q35-virtio-pci.xml | 1 +
tests/qemuxml2xmloutdata/q35.xml | 1 +
tests/qemuxml2xmloutdata/seclabel-dac-none.xml | 1 +
tests/qemuxml2xmloutdata/seclabel-device-multiple.xml | 1 +
tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml | 1 +
tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml | 1 +
tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml | 1 +
tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml | 2 ++
tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml | 1 +
tests/qemuxml2xmloutdata/seclabel-none.xml | 1 +
tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml | 1 +
tests/qemuxml2xmloutdata/seclabel-static.xml | 1 +
tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml | 1 +
tests/qemuxml2xmloutdata/serial-spiceport.xml | 1 +
tests/qemuxml2xmloutdata/serial-target-port-auto.xml | 1 +
tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml | 1 +
tests/qemuxml2xmloutdata/smbios-multiple-type2.xml | 1 +
tests/qemuxml2xmloutdata/smbios.xml | 1 +
tests/qemuxml2xmloutdata/sound-device.xml | 1 +
tests/qemuxml2xmloutdata/video-qxl-heads.xml | 1 +
tests/qemuxml2xmloutdata/video-qxl-noheads.xml | 1 +
tests/qemuxml2xmloutdata/vmcoreinfo.xml | 1 +
tests/qemuxml2xmltest.c | 3 ---
147 files changed, 180 insertions(+), 7 deletions(-)
diff --git a/tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml
b/tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml
index 085429d969..0a81ed4489 100644
--- a/tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml
+++ b/tests/qemuxml2argvdata/disk-drive-detect-zeroes.xml
@@ -23,7 +23,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
<disk type='file' device='cdrom'>
- <driver discard='ignore' detect_zeroes='unmap'/>
+ <driver name='qemu' type='raw' discard='ignore'
detect_zeroes='unmap'/>
<source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/>
<target dev='hdc' bus='ide'/>
<readonly/>
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.xml
b/tests/qemuxml2argvdata/hugepages-memaccess.xml
index db9b9430e1..cd75440254 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess.xml
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.xml
@@ -35,6 +35,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.xml
b/tests/qemuxml2argvdata/hugepages-memaccess2.xml
index c0011285c2..205f9efd92 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.xml
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.xml
@@ -35,6 +35,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/hugepages-pages4.xml
b/tests/qemuxml2argvdata/hugepages-pages4.xml
index 13809e52b4..9f79881a59 100644
--- a/tests/qemuxml2argvdata/hugepages-pages4.xml
+++ b/tests/qemuxml2argvdata/hugepages-pages4.xml
@@ -33,6 +33,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/hugepages-pages5.xml
b/tests/qemuxml2argvdata/hugepages-pages5.xml
index 1e4ca64f85..f636c186de 100644
--- a/tests/qemuxml2argvdata/hugepages-pages5.xml
+++ b/tests/qemuxml2argvdata/hugepages-pages5.xml
@@ -20,6 +20,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/hugepages-pages6.xml
b/tests/qemuxml2argvdata/hugepages-pages6.xml
index ae8de680dd..fc4f57fbc0 100644
--- a/tests/qemuxml2argvdata/hugepages-pages6.xml
+++ b/tests/qemuxml2argvdata/hugepages-pages6.xml
@@ -20,6 +20,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
index 1617624891..b41484ad2b 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
@@ -26,6 +26,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
index 4efe556d25..e266147a29 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
@@ -26,6 +26,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
index 0e064e6986..751ad27474 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
@@ -26,6 +26,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
index 89dc9e6e1d..ddda2c62b9 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml
b/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml
index 9e728300e5..c30690e7bc 100644
--- a/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml
@@ -27,6 +27,7 @@
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/aarch64.raw'/>
<target dev='vda' bus='virtio'/>
<address type='virtio-mmio'/>
diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml
b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml
index 9796d7f637..c569a2886d 100644
--- a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml
@@ -27,6 +27,7 @@
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/aarch64.raw'/>
<target dev='vda' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x03'
slot='0x00' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml
b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml
index 83d8dcc4a7..b28e644844 100644
--- a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml
@@ -27,6 +27,7 @@
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/aarch64.raw'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/autoindex.xml
b/tests/qemuxml2xmloutdata/autoindex.xml
index 9ab689eda7..382dc73f1c 100644
--- a/tests/qemuxml2xmloutdata/autoindex.xml
+++ b/tests/qemuxml2xmloutdata/autoindex.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sda' bus='sata'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/balloon-device-auto.xml
b/tests/qemuxml2xmloutdata/balloon-device-auto.xml
index 33e952d5ce..cc92b7823f 100644
--- a/tests/qemuxml2xmloutdata/balloon-device-auto.xml
+++ b/tests/qemuxml2xmloutdata/balloon-device-auto.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/balloon-device-period.xml
b/tests/qemuxml2xmloutdata/balloon-device-period.xml
index c21f4d747a..45c7a22f39 100644
--- a/tests/qemuxml2xmloutdata/balloon-device-period.xml
+++ b/tests/qemuxml2xmloutdata/balloon-device-period.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
b/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
index b6d7a66361..dfa496a215 100644
--- a/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
+++ b/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
@@ -21,6 +21,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/bios-nvram.xml
b/tests/qemuxml2xmloutdata/bios-nvram.xml
index 8e254925ba..eabbf717f9 100644
--- a/tests/qemuxml2xmloutdata/bios-nvram.xml
+++ b/tests/qemuxml2xmloutdata/bios-nvram.xml
@@ -21,6 +21,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/blkiotune-device.xml
b/tests/qemuxml2xmloutdata/blkiotune-device.xml
index 476a732d61..4a3a6b4327 100644
--- a/tests/qemuxml2xmloutdata/blkiotune-device.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune-device.xml
@@ -34,6 +34,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/blkiotune.xml
b/tests/qemuxml2xmloutdata/blkiotune.xml
index 67fa84c903..79f899d717 100644
--- a/tests/qemuxml2xmloutdata/blkiotune.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune.xml
@@ -18,6 +18,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
index b42b52ee51..8962ffbdd9 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
@@ -16,6 +16,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='cdrom'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/cdrom'/>
<target dev='hdc' bus='ide'/>
<readonly/>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable.xml
b/tests/qemuxml2xmloutdata/boot-menu-disable.xml
index b42b52ee51..8962ffbdd9 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-disable.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable.xml
@@ -16,6 +16,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='cdrom'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/cdrom'/>
<target dev='hdc' bus='ide'/>
<readonly/>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
index 981a52090c..90f323a1e2 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
@@ -16,6 +16,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='cdrom'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/cdrom'/>
<target dev='hdc' bus='ide'/>
<readonly/>
diff --git a/tests/qemuxml2xmloutdata/boot-multi.xml
b/tests/qemuxml2xmloutdata/boot-multi.xml
index dab9041585..390d198f25 100644
--- a/tests/qemuxml2xmloutdata/boot-multi.xml
+++ b/tests/qemuxml2xmloutdata/boot-multi.xml
@@ -19,6 +19,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='cdrom'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/cdrom'/>
<target dev='hdc' bus='ide'/>
<readonly/>
diff --git a/tests/qemuxml2xmloutdata/boot-order.xml
b/tests/qemuxml2xmloutdata/boot-order.xml
index 0e95901b88..1e4ca91d05 100644
--- a/tests/qemuxml2xmloutdata/boot-order.xml
+++ b/tests/qemuxml2xmloutdata/boot-order.xml
@@ -14,11 +14,13 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
+ <driver name='qemu' type='raw'/>
<source file='/root/boot.iso'/>
<target dev='hdc' bus='ide'/>
<readonly/>
diff --git a/tests/qemuxml2xmloutdata/channel-guestfwd.xml
b/tests/qemuxml2xmloutdata/channel-guestfwd.xml
index 2e1f720838..3eeddda0b4 100644
--- a/tests/qemuxml2xmloutdata/channel-guestfwd.xml
+++ b/tests/qemuxml2xmloutdata/channel-guestfwd.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
index 6fd0358156..3bed3b6c0d 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
index 7d93fc0c0a..4487ea47dd 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
index 32a2673f4a..0a427ba484 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio.xml
b/tests/qemuxml2xmloutdata/channel-virtio.xml
index 1fe09a1cff..5400658353 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/clock-catchup.xml
b/tests/qemuxml2xmloutdata/clock-catchup.xml
index e019895991..e171fae534 100644
--- a/tests/qemuxml2xmloutdata/clock-catchup.xml
+++ b/tests/qemuxml2xmloutdata/clock-catchup.xml
@@ -25,6 +25,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/console-compat-auto.xml
b/tests/qemuxml2xmloutdata/console-compat-auto.xml
index 267b253b15..ec7ca296e3 100644
--- a/tests/qemuxml2xmloutdata/console-compat-auto.xml
+++ b/tests/qemuxml2xmloutdata/console-compat-auto.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/console-virtio-many.xml
b/tests/qemuxml2xmloutdata/console-virtio-many.xml
index 1a22b78b8c..4f718dfbd8 100644
--- a/tests/qemuxml2xmloutdata/console-virtio-many.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio-many.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/console-virtio.xml
b/tests/qemuxml2xmloutdata/console-virtio.xml
index 0f4469b14a..334cc21c2e 100644
--- a/tests/qemuxml2xmloutdata/console-virtio.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
index 9a73c2a673..6d47bd84fe 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
@@ -25,6 +25,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/cputune-iothreads.xml
b/tests/qemuxml2xmloutdata/cputune-iothreads.xml
index 6aed4dc4db..e647cf70e7 100644
--- a/tests/qemuxml2xmloutdata/cputune-iothreads.xml
+++ b/tests/qemuxml2xmloutdata/cputune-iothreads.xml
@@ -26,6 +26,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
index 87fc71cb02..0ba6b5ae93 100644
--- a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
+++ b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
@@ -29,6 +29,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
index 4efc3b8cca..a496f13e14 100644
--- a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
+++ b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
@@ -29,6 +29,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
index 14205479e5..cea21402dc 100644
--- a/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
+++ b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
@@ -23,6 +23,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/cputune.xml b/tests/qemuxml2xmloutdata/cputune.xml
index fe8d5d0bbe..612eb76e71 100644
--- a/tests/qemuxml2xmloutdata/cputune.xml
+++ b/tests/qemuxml2xmloutdata/cputune.xml
@@ -27,6 +27,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml
b/tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml
index d1f9834654..69361a453a 100644
--- a/tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml
+++ b/tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml
@@ -15,7 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
- <driver copy_on_read='on'/>
+ <driver name='qemu' type='raw' copy_on_read='on'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/disk-drive-discard.xml
b/tests/qemuxml2xmloutdata/disk-drive-discard.xml
index 4fe85b1cdc..d51c3a1819 100644
--- a/tests/qemuxml2xmloutdata/disk-drive-discard.xml
+++ b/tests/qemuxml2xmloutdata/disk-drive-discard.xml
@@ -23,7 +23,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
<disk type='file' device='cdrom'>
- <driver discard='ignore'/>
+ <driver name='qemu' type='raw' discard='ignore'/>
<source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/>
<target dev='hdc' bus='ide'/>
<readonly/>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-active.xml
b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
index c1e8a33ec1..d689eac6b8 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
@@ -15,15 +15,18 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<backingStore/>
<mirror type='block' job='copy' ready='yes'>
+ <format type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1Copy'/>
</mirror>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<backingStore/>
<target dev='hdc' bus='ide'/>
@@ -31,6 +34,7 @@
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/data.img'/>
<backingStore/>
<mirror type='file' file='/tmp/copy.img' format='qcow2'
job='copy'>
@@ -41,6 +45,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/logs.img'/>
<backingStore/>
<mirror type='file' file='/tmp/logcopy.img'
format='qcow2' job='copy' ready='abort'>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
index b3bba884ee..cc7aed0873 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
@@ -15,22 +15,26 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/data.img'/>
<target dev='vda' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/logs.img'/>
<target dev='vdb' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
index b3bba884ee..cc7aed0873 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
@@ -15,22 +15,26 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdc' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/data.img'/>
<target dev='vda' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/logs.img'/>
<target dev='vdb' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old.xml
b/tests/qemuxml2xmloutdata/disk-mirror-old.xml
index e390bc02f2..f8a885aec8 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-old.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old.xml
@@ -15,15 +15,18 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<backingStore/>
- <mirror type='file' file='/dev/HostVG/QEMUGuest1Copy'
job='copy' ready='yes'>
+ <mirror type='file' file='/dev/HostVG/QEMUGuest1Copy'
format='raw' job='copy' ready='yes'>
+ <format type='raw'/>
<source file='/dev/HostVG/QEMUGuest1Copy'/>
</mirror>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='block' device='cdrom'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<backingStore/>
<target dev='hdc' bus='ide'/>
@@ -31,6 +34,7 @@
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/data.img'/>
<backingStore/>
<mirror type='file' file='/tmp/copy.img' format='qcow2'
job='copy'>
@@ -41,6 +45,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/logs.img'/>
<backingStore/>
<target dev='vdb' bus='virtio'/>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
index a0db32b56f..012b3cc263 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
@@ -15,11 +15,13 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/scsidisk.img'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-device.xml
b/tests/qemuxml2xmloutdata/disk-scsi-device.xml
index b46ffb6315..c1b44a54a1 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-device.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-device.xml
@@ -15,11 +15,13 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/scsidisk.img'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
index 9d62909504..c36f07db1c 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='cdrom'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sda' bus='scsi'/>
<readonly/>
@@ -23,6 +24,7 @@
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='sdb' bus='scsi'/>
<readonly/>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
index 80eb3cc21a..604ee8c9e3 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
@@ -15,11 +15,13 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='lun' rawio='no'
sgio='unfiltered'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='block' device='lun' sgio='filtered'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdb' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='1' unit='1'/>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-megasas.xml
b/tests/qemuxml2xmloutdata/disk-scsi-megasas.xml
index 6e6280bbf7..3453f1f750 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-megasas.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-megasas.xml
@@ -15,11 +15,13 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/scsidisk.img'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='4' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml
b/tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml
index 75e26ae666..e4f4b9e3b1 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml
@@ -15,11 +15,13 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/scsidisk.img'/>
<target dev='sda' bus='scsi'/>
<wwn>5000c50015ea71ac</wwn>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml
b/tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml
index a7ee28684a..069a35f27c 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml
@@ -15,11 +15,13 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/scsidisk.img'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='4' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml
b/tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml
index ced2b2be9a..5f0cc50674 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml
@@ -15,11 +15,13 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/scsidisk.img'/>
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='3' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/disk-serial.xml
b/tests/qemuxml2xmloutdata/disk-serial.xml
index 5a26e549df..9313c699b6 100644
--- a/tests/qemuxml2xmloutdata/disk-serial.xml
+++ b/tests/qemuxml2xmloutdata/disk-serial.xml
@@ -15,18 +15,21 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<serial> WD-WMAP9A966149</serial>
<address type='drive' controller='0' bus='0'
target='0' unit='1'/>
</disk>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/AllSerialChars'/>
<target dev='hdb' bus='ide'/>
<serial>abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_
.+</serial>
<address type='drive' controller='0' bus='0'
target='0' unit='2'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/some/file'/>
<target dev='sda' bus='sd'/>
<serial>sdserial</serial>
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
index a14ed7b973..29706200db 100644
--- a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='volume' device='cdrom'>
+ <driver name='qemu'/>
<source pool='pool-iscsi-auth' volume='unit:0:0:1'
mode='host'>
<seclabel model='selinux' relabel='yes'>
<label>system_u:system_r:public_content_t:s0</label>
@@ -25,6 +26,7 @@
<address type='drive' controller='0' bus='0'
target='0' unit='1'/>
</disk>
<disk type='volume' device='cdrom'>
+ <driver name='qemu'/>
<source pool='pool-iscsi' volume='unit:0:0:2'
mode='direct'>
<seclabel model='selinux' relabel='yes'>
<label>system_u:system_r:public_content_t:s0</label>
@@ -35,11 +37,13 @@
<address type='drive' controller='0' bus='0'
target='0' unit='2'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/idedisk.img'/>
<target dev='hdc' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='3'/>
</disk>
<disk type='volume' device='cdrom'>
+ <driver name='qemu'/>
<auth username='myname'>
<secret type='iscsi' usage='mycluster_myname'/>
</auth>
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool.xml
b/tests/qemuxml2xmloutdata/disk-source-pool.xml
index 2379a8ca17..567b22db84 100644
--- a/tests/qemuxml2xmloutdata/disk-source-pool.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='volume' device='cdrom'>
+ <driver name='qemu'/>
<source pool='pool-disk' volume='block+cdrom'>
<seclabel model='selinux' relabel='yes'>
<label>system_u:system_r:public_content_t:s0</label>
@@ -31,6 +32,7 @@
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/idedisk.img'/>
<target dev='hdd' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-usb-device.xml
b/tests/qemuxml2xmloutdata/disk-usb-device.xml
index b5bcca935f..07282c87a0 100644
--- a/tests/qemuxml2xmloutdata/disk-usb-device.xml
+++ b/tests/qemuxml2xmloutdata/disk-usb-device.xml
@@ -15,11 +15,13 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
+ <driver name='qemu' type='raw'/>
<source file='/tmp/usbdisk.img'/>
<target dev='sda' bus='usb'/>
</disk>
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml
b/tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml
index b5e55ca51f..f50a668625 100644
--- a/tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml
+++ b/tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sdb' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml
b/tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml
index 4ec0471696..f2c0b47731 100644
--- a/tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml
+++ b/tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sdb' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml
b/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml
index afebb413b3..07f4012fd0 100644
--- a/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml
+++ b/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sdb' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml
b/tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml
index 0c14b70082..f0776b6b71 100644
--- a/tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml
+++ b/tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sdb' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network.xml
b/tests/qemuxml2xmloutdata/graphics-listen-network.xml
index d1f5b82cd8..144d315b57 100644
--- a/tests/qemuxml2xmloutdata/graphics-listen-network.xml
+++ b/tests/qemuxml2xmloutdata/graphics-listen-network.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
b/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
index 6ccf0d10a9..ad44f67443 100644
--- a/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
+++ b/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml
b/tests/qemuxml2xmloutdata/graphics-spice-compression.xml
index a387e2b4a0..27854421c5 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-compression.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
index 1b56f63bab..78af3846df 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice.xml
b/tests/qemuxml2xmloutdata/graphics-spice.xml
index c6327a9f7f..1822bc35cc 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
index cea212b64d..3b4242e409 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
index b0ed1532c9..1b0da12f60 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml
index 3d0efdcafe..beeb3cb11e 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml
index 28b80a02bb..cff162b4ea 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
index 545ce3ba8f..d8931da38a 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
index 2f2709eafe..df1375d1a5 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
index 57a4efd226..dd252f8524 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
index cff25e7479..05cefc003b 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
index 6731d6dfd8..31aa2dd3b5 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
index 6012d241ce..3723bd0a98 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-s390x</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='virtio'/>
<address type='ccw' cssid='0xfe' ssid='0x0'
devno='0x0000'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
index cb97544d30..174096b0d9 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml
index 74a93dd5d6..a3886ec750 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml
index ddf7801602..d31af322ac 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
index c771b1cafa..df87897323 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio.xml
b/tests/qemuxml2xmloutdata/hostdev-vfio.xml
index 786d9b81e0..77bd62a129 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hugepages-pages.xml
b/tests/qemuxml2xmloutdata/hugepages-pages.xml
index f4c3d9725a..498610a217 100644
--- a/tests/qemuxml2xmloutdata/hugepages-pages.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-pages.xml
@@ -33,6 +33,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hugepages-pages2.xml
b/tests/qemuxml2xmloutdata/hugepages-pages2.xml
index 942b5d8c94..cd79960f1b 100644
--- a/tests/qemuxml2xmloutdata/hugepages-pages2.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-pages2.xml
@@ -26,6 +26,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hugepages-pages3.xml
b/tests/qemuxml2xmloutdata/hugepages-pages3.xml
index 928c4ff61f..be21c3eddd 100644
--- a/tests/qemuxml2xmloutdata/hugepages-pages3.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-pages3.xml
@@ -26,6 +26,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hugepages-shared.xml
b/tests/qemuxml2xmloutdata/hugepages-shared.xml
index bf296a1a78..e56d1ace83 100644
--- a/tests/qemuxml2xmloutdata/hugepages-shared.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-shared.xml
@@ -33,6 +33,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/hugepages.xml
b/tests/qemuxml2xmloutdata/hugepages.xml
index 461e862411..f78ca95c1b 100644
--- a/tests/qemuxml2xmloutdata/hugepages.xml
+++ b/tests/qemuxml2xmloutdata/hugepages.xml
@@ -18,6 +18,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/lease.xml b/tests/qemuxml2xmloutdata/lease.xml
index 328946d6e3..a6ba5903cc 100644
--- a/tests/qemuxml2xmloutdata/lease.xml
+++ b/tests/qemuxml2xmloutdata/lease.xml
@@ -15,11 +15,13 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
+ <driver name='qemu' type='raw'/>
<source file='/root/boot.iso'/>
<target dev='hdc' bus='ide'/>
<readonly/>
diff --git a/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml
b/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml
index 2f0bb83107..c4e08fd440 100644
--- a/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml
+++ b/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml
@@ -14,12 +14,14 @@
<devices>
<emulator>/usr/bin/qemu-system-s390x</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='virtio'/>
<boot order='1' loadparm='SYSTEM1'/>
<address type='ccw' cssid='0xfe' ssid='0x0'
devno='0x0002'/>
</disk>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdb' bus='virtio'/>
<boot order='3' loadparm='3'/>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
index ed0894ee0e..d26675852f 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
@@ -26,6 +26,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.xml
b/tests/qemuxml2xmloutdata/memory-hotplug.xml
index e6771b5421..a5d82346be 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug.xml
@@ -22,6 +22,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/memtune-unlimited.xml
b/tests/qemuxml2xmloutdata/memtune-unlimited.xml
index 9aec678e2e..1910edab41 100644
--- a/tests/qemuxml2xmloutdata/memtune-unlimited.xml
+++ b/tests/qemuxml2xmloutdata/memtune-unlimited.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/memtune.xml b/tests/qemuxml2xmloutdata/memtune.xml
index 039afafd43..55db8a2daf 100644
--- a/tests/qemuxml2xmloutdata/memtune.xml
+++ b/tests/qemuxml2xmloutdata/memtune.xml
@@ -20,6 +20,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/metadata-duplicate.xml
b/tests/qemuxml2xmloutdata/metadata-duplicate.xml
index 659eedf85e..2ac9c2aa54 100644
--- a/tests/qemuxml2xmloutdata/metadata-duplicate.xml
+++ b/tests/qemuxml2xmloutdata/metadata-duplicate.xml
@@ -19,6 +19,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/metadata.xml
b/tests/qemuxml2xmloutdata/metadata.xml
index 659eedf85e..2ac9c2aa54 100644
--- a/tests/qemuxml2xmloutdata/metadata.xml
+++ b/tests/qemuxml2xmloutdata/metadata.xml
@@ -19,6 +19,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/minimal.xml b/tests/qemuxml2xmloutdata/minimal.xml
index 1bb3b33736..1a0cf56824 100644
--- a/tests/qemuxml2xmloutdata/minimal.xml
+++ b/tests/qemuxml2xmloutdata/minimal.xml
@@ -20,6 +20,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
index 8b51648d54..0523cd8d3b 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev.xml
b/tests/qemuxml2xmloutdata/net-hostdev.xml
index ddc6151687..bede4b034f 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/net-midonet.xml
b/tests/qemuxml2xmloutdata/net-midonet.xml
index fe61e33c8d..49fe8f6ec2 100644
--- a/tests/qemuxml2xmloutdata/net-midonet.xml
+++ b/tests/qemuxml2xmloutdata/net-midonet.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/net-openvswitch.xml
b/tests/qemuxml2xmloutdata/net-openvswitch.xml
index e2483f59d9..13efaca2cb 100644
--- a/tests/qemuxml2xmloutdata/net-openvswitch.xml
+++ b/tests/qemuxml2xmloutdata/net-openvswitch.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/net-udp.xml b/tests/qemuxml2xmloutdata/net-udp.xml
index d30e85a2fe..efd74cb36d 100644
--- a/tests/qemuxml2xmloutdata/net-udp.xml
+++ b/tests/qemuxml2xmloutdata/net-udp.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-device.xml
b/tests/qemuxml2xmloutdata/net-virtio-device.xml
index 73d693b75f..f1238cde2b 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-device.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-device.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
index 3ed5d02d35..e5cad4078b 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest7'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
index b70f73cd87..fe8c5657ce 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
index 5c33a58ad5..753c2f247e 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
index ea8cbf9202..6e3aa331c5 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
@@ -21,6 +21,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
index c895e42f02..0be69f5b02 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
@@ -21,6 +21,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
index 2a4455b9c1..04d9a3ee5e 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
@@ -21,6 +21,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
index c3608c0dad..3dae444172 100644
--- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
@@ -18,6 +18,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/panic-isa.xml
b/tests/qemuxml2xmloutdata/panic-isa.xml
index 6069073891..8f4f330d54 100644
--- a/tests/qemuxml2xmloutdata/panic-isa.xml
+++ b/tests/qemuxml2xmloutdata/panic-isa.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/panic-no-address.xml
b/tests/qemuxml2xmloutdata/panic-no-address.xml
index 9ddafb1626..b05d2209ac 100644
--- a/tests/qemuxml2xmloutdata/panic-no-address.xml
+++ b/tests/qemuxml2xmloutdata/panic-no-address.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/panic.xml b/tests/qemuxml2xmloutdata/panic.xml
index 6069073891..8f4f330d54 100644
--- a/tests/qemuxml2xmloutdata/panic.xml
+++ b/tests/qemuxml2xmloutdata/panic.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/pci-rom.xml b/tests/qemuxml2xmloutdata/pci-rom.xml
index ee893fdd53..982231fefe 100644
--- a/tests/qemuxml2xmloutdata/pci-rom.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
index 8f77ef043a..5308d4d253 100644
--- a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
+++ b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
index aaac423cac..008d01e5f8 100644
--- a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
+++ b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
@@ -22,6 +22,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sda' bus='sata'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port.xml
b/tests/qemuxml2xmloutdata/pcie-root-port.xml
index 9f6e120405..1424b9e22e 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sda' bus='sata'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
b/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
index 9970a83e25..ca49d04a76 100644
--- a/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
+++ b/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sda' bus='sata'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
b/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
index 1453fffd74..f994957c32 100644
--- a/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
+++ b/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sda' bus='sata'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/pcihole64-q35.xml
b/tests/qemuxml2xmloutdata/pcihole64-q35.xml
index 6818094436..b3f591c451 100644
--- a/tests/qemuxml2xmloutdata/pcihole64-q35.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-q35.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sda' bus='sata'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml
b/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml
index 2e5f2e241c..9ce1c317b2 100644
--- a/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml
+++ b/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='vdb' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x07'
slot='0x00' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/q35-pcie.xml
b/tests/qemuxml2xmloutdata/q35-pcie.xml
index 4d08c9627e..75ca42a20e 100644
--- a/tests/qemuxml2xmloutdata/q35-pcie.xml
+++ b/tests/qemuxml2xmloutdata/q35-pcie.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='vdb' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x09'
slot='0x00' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/q35-usb2-multi.xml
b/tests/qemuxml2xmloutdata/q35-usb2-multi.xml
index 5ca50223b4..2ad1ddec21 100644
--- a/tests/qemuxml2xmloutdata/q35-usb2-multi.xml
+++ b/tests/qemuxml2xmloutdata/q35-usb2-multi.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sda' bus='sata'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
b/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
index 7081d9cc98..912ae8a890 100644
--- a/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
+++ b/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sda' bus='sata'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/q35-usb2.xml
b/tests/qemuxml2xmloutdata/q35-usb2.xml
index da3989914b..3d5407609e 100644
--- a/tests/qemuxml2xmloutdata/q35-usb2.xml
+++ b/tests/qemuxml2xmloutdata/q35-usb2.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sda' bus='sata'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/q35-virtio-pci.xml
b/tests/qemuxml2xmloutdata/q35-virtio-pci.xml
index ea204194d4..f534a54c0f 100644
--- a/tests/qemuxml2xmloutdata/q35-virtio-pci.xml
+++ b/tests/qemuxml2xmloutdata/q35-virtio-pci.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='vdb' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x02'
slot='0x05' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/q35.xml b/tests/qemuxml2xmloutdata/q35.xml
index c57f178e41..fa230ce9b5 100644
--- a/tests/qemuxml2xmloutdata/q35.xml
+++ b/tests/qemuxml2xmloutdata/q35.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='sda' bus='sata'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
index cb32458f80..04418be906 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
index 4e83ac390b..46b6b210b5 100644
--- a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'>
<seclabel model='selinux' relabel='yes'>
<label>system_u:system_r:svirt_custom_t:s0:c192,c392</label>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml
index 3f4ff0aadf..7163015192 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml
index 3f4ff0aadf..7163015192 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
index 9d58317a0d..067889262c 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml
index 91fa637aef..9e21c054b0 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'>
<seclabel model='selinux' relabel='no'/>
</source>
@@ -22,6 +23,7 @@
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'>
<seclabel model='selinux' relabel='yes'>
<label>system_u:system_r:public_content_t:s0</label>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml
index 9d58317a0d..067889262c 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-none.xml
b/tests/qemuxml2xmloutdata/seclabel-none.xml
index 9d58317a0d..067889262c 100644
--- a/tests/qemuxml2xmloutdata/seclabel-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-none.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml
b/tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml
index d37b950cbf..7c448675e2 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'>
<seclabel model='selinux' labelskip='yes'/>
</source>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static.xml
b/tests/qemuxml2xmloutdata/seclabel-static.xml
index cecc9ad487..2197104d57 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
index e1d5cb9d72..560f4d2b77 100644
--- a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
+++ b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/serial-spiceport.xml
b/tests/qemuxml2xmloutdata/serial-spiceport.xml
index ff92435afe..287f3817e1 100644
--- a/tests/qemuxml2xmloutdata/serial-spiceport.xml
+++ b/tests/qemuxml2xmloutdata/serial-spiceport.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
index fded758eac..cc10a55bcf 100644
--- a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
+++ b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
index 76d8948204..44a5be35b4 100644
--- a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
+++ b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
index 2a1b85851d..d3dd152aed 100644
--- a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
+++ b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
@@ -46,6 +46,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/smbios.xml b/tests/qemuxml2xmloutdata/smbios.xml
index d5f1d29610..931c291d21 100644
--- a/tests/qemuxml2xmloutdata/smbios.xml
+++ b/tests/qemuxml2xmloutdata/smbios.xml
@@ -51,6 +51,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/sound-device.xml
b/tests/qemuxml2xmloutdata/sound-device.xml
index 281dd1e105..62336a8c2d 100644
--- a/tests/qemuxml2xmloutdata/sound-device.xml
+++ b/tests/qemuxml2xmloutdata/sound-device.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-heads.xml
b/tests/qemuxml2xmloutdata/video-qxl-heads.xml
index 204366f181..69c625bddc 100644
--- a/tests/qemuxml2xmloutdata/video-qxl-heads.xml
+++ b/tests/qemuxml2xmloutdata/video-qxl-heads.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
index be8008454b..6ba2817002 100644
--- a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
+++ b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
@@ -15,6 +15,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmloutdata/vmcoreinfo.xml
b/tests/qemuxml2xmloutdata/vmcoreinfo.xml
index a3922d6304..d0cd2f2ce9 100644
--- a/tests/qemuxml2xmloutdata/vmcoreinfo.xml
+++ b/tests/qemuxml2xmloutdata/vmcoreinfo.xml
@@ -18,6 +18,7 @@
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 0b9efaad50..b1fc6a2d28 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -378,9 +378,6 @@ mymain(void)
cfg = virQEMUDriverGetConfig(&driver);
- /* TODO: test with format probing disabled too */
- driver.config->allowDiskFormatProbing = true;
-
# define DO_TEST_FULL(name, when, gic, ...) \
do { \
if (testInfoSet(&info, name, when, gic) < 0) { \
--
2.16.2