tests: qemuxml2xml: Remove testing with allowed format detection

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: N Peter Krempa <pkrempa@redhat.com>

tests: qemuxml2xml: Remove testing with allowed format detection
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: N Peter Krempa <pkrempa@redhat.com>
9fc79688 · Peter Krempa · d493e03a · 9fc79688 · 9fc79688 · 9fc79688
147 changed file
--- 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/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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/>

--- 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/>

--- 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/>

--- 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/>

--- 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/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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/>

--- 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'>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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/>

--- 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'/>

--- 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'/>

--- 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>

--- 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'/>

--- 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'/>

--- 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>

--- 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>

--- 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'/>

--- 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>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- 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'/>

--- a/tests/qemuxml2xmloutdata/net-udp.xml
+++ b/tests/qemuxml2xmloutdata/net-udp.xml
--- a/tests/qemuxml2xmloutdata/net-virtio-device.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-device.xml
--- a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
--- a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
--- a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
--- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
--- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
--- a/tests/qemuxml2xmloutdata/panic-isa.xml
+++ b/tests/qemuxml2xmloutdata/panic-isa.xml
--- a/tests/qemuxml2xmloutdata/panic-no-address.xml
+++ b/tests/qemuxml2xmloutdata/panic-no-address.xml
--- a/tests/qemuxml2xmloutdata/panic.xml
+++ b/tests/qemuxml2xmloutdata/panic.xml
--- a/tests/qemuxml2xmloutdata/pci-rom.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom.xml
--- a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
+++ b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
--- a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
+++ b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
--- a/tests/qemuxml2xmloutdata/pcie-root-port.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port.xml
--- a/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
+++ b/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
--- a/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
+++ b/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
--- a/tests/qemuxml2xmloutdata/pcihole64-q35.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-q35.xml
--- a/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml
+++ b/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml
--- a/tests/qemuxml2xmloutdata/q35-pcie.xml
+++ b/tests/qemuxml2xmloutdata/q35-pcie.xml
--- a/tests/qemuxml2xmloutdata/q35-usb2-multi.xml
+++ b/tests/qemuxml2xmloutdata/q35-usb2-multi.xml
--- a/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
+++ b/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
--- a/tests/qemuxml2xmloutdata/q35-usb2.xml
+++ b/tests/qemuxml2xmloutdata/q35-usb2.xml
--- a/tests/qemuxml2xmloutdata/q35-virtio-pci.xml
+++ b/tests/qemuxml2xmloutdata/q35-virtio-pci.xml
--- a/tests/qemuxml2xmloutdata/q35.xml
+++ b/tests/qemuxml2xmloutdata/q35.xml
--- a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
--- a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml
--- a/tests/qemuxml2xmloutdata/seclabel-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-none.xml
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml
--- a/tests/qemuxml2xmloutdata/seclabel-static.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static.xml
--- a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
+++ b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
--- a/tests/qemuxml2xmloutdata/serial-spiceport.xml
+++ b/tests/qemuxml2xmloutdata/serial-spiceport.xml
--- a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
+++ b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
--- a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
+++ b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
--- a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
+++ b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
--- a/tests/qemuxml2xmloutdata/smbios.xml
+++ b/tests/qemuxml2xmloutdata/smbios.xml
--- a/tests/qemuxml2xmloutdata/sound-device.xml
+++ b/tests/qemuxml2xmloutdata/sound-device.xml
--- a/tests/qemuxml2xmloutdata/video-qxl-heads.xml
+++ b/tests/qemuxml2xmloutdata/video-qxl-heads.xml
--- a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
+++ b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
--- a/tests/qemuxml2xmloutdata/vmcoreinfo.xml
+++ b/tests/qemuxml2xmloutdata/vmcoreinfo.xml
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c