diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 96e03a3807..252ba7c17c 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -5232,7 +5232,6 @@ or stopping the guest.
    ...
    <devices>
      <interface type='hostdev' managed='yes'>
-       <driver name='vfio'/>
        <source>
          <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
        </source>
diff --git a/docs/formatnetwork.rst b/docs/formatnetwork.rst
index c54d53070a..5d300a035e 100644
--- a/docs/formatnetwork.rst
+++ b/docs/formatnetwork.rst
@@ -392,7 +392,6 @@ to the physical LAN (if at all).
 
       ...
         <forward mode='hostdev' managed='yes'>
-          <driver name='vfio'/>
           <address type='pci' domain='0' bus='4' slot='0' function='1'/>
           <address type='pci' domain='0' bus='4' slot='0' function='2'/>
           <address type='pci' domain='0' bus='4' slot='0' function='3'/>
diff --git a/docs/formatnetworkport.rst b/docs/formatnetworkport.rst
index 40a4f0e85b..e60445b3b4 100644
--- a/docs/formatnetworkport.rst
+++ b/docs/formatnetworkport.rst
@@ -163,7 +163,6 @@ rather than emulation.
 
      ...
      <plug type='hostdev-pci' managed='yes'>
-       <driver name='vfio'/>
        <address domain='0x0001' bus='0x02' slot='0x03' function='0x4'/>
      </plug>
      ...
diff --git a/docs/pci-addresses.rst b/docs/pci-addresses.rst
index eb4945f169..bfc0bbccc3 100644
--- a/docs/pci-addresses.rst
+++ b/docs/pci-addresses.rst
@@ -223,7 +223,6 @@ For example, the domain XML snippet
 ::
 
   <hostdev mode='subsystem' type='pci' managed='yes'>
-    <driver name='vfio'/>
     <source>
       <address domain='0x0001' bus='0x08' slot='0x00' function='0x0'/>
     </source>
diff --git a/tests/networkxml2xmlin/hostdev-pf.xml b/tests/networkxml2xmlin/hostdev-pf.xml
index 5b8f59858c..7bf857d3a1 100644
--- a/tests/networkxml2xmlin/hostdev-pf.xml
+++ b/tests/networkxml2xmlin/hostdev-pf.xml
@@ -2,7 +2,6 @@
   <name>hostdev</name>
   <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
   <forward mode='hostdev' managed='yes'>
-    <driver name='vfio'/>
     <pf dev='eth2'/>
   </forward>
 </network>
diff --git a/tests/networkxml2xmlout/hostdev-pf.xml b/tests/networkxml2xmlout/hostdev-pf.xml
index 5b8f59858c..7bf857d3a1 100644
--- a/tests/networkxml2xmlout/hostdev-pf.xml
+++ b/tests/networkxml2xmlout/hostdev-pf.xml
@@ -2,7 +2,6 @@
   <name>hostdev</name>
   <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
   <forward mode='hostdev' managed='yes'>
-    <driver name='vfio'/>
     <pf dev='eth2'/>
   </forward>
 </network>
diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-hostdev-pci.xml b/tests/qemuhotplugtestdevices/qemuhotplug-hostdev-pci.xml
index 6f7c99c943..0d6dec9d26 100644
--- a/tests/qemuhotplugtestdevices/qemuhotplug-hostdev-pci.xml
+++ b/tests/qemuhotplugtestdevices/qemuhotplug-hostdev-pci.xml
@@ -1,5 +1,4 @@
 <hostdev mode='subsystem' type='pci' managed='yes'>
-  <driver name='vfio'/>
   <source>
     <address domain='0x0000' bus='0x06' slot='0x12' function='0x2'/>
   </source>
diff --git a/tests/qemumemlockdata/qemumemlock-pc-hardlimit+hostdev.xml b/tests/qemumemlockdata/qemumemlock-pc-hardlimit+hostdev.xml
index e03f5a585d..18bafaa355 100644
--- a/tests/qemumemlockdata/qemumemlock-pc-hardlimit+hostdev.xml
+++ b/tests/qemumemlockdata/qemumemlock-pc-hardlimit+hostdev.xml
@@ -11,7 +11,6 @@
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemumemlockdata/qemumemlock-pc-hardlimit+locked+hostdev.xml b/tests/qemumemlockdata/qemumemlock-pc-hardlimit+locked+hostdev.xml
index 7070e5a12c..34a3960e8b 100644
--- a/tests/qemumemlockdata/qemumemlock-pc-hardlimit+locked+hostdev.xml
+++ b/tests/qemumemlockdata/qemumemlock-pc-hardlimit+locked+hostdev.xml
@@ -14,7 +14,6 @@
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemumemlockdata/qemumemlock-pc-hostdev-nvme.xml b/tests/qemumemlockdata/qemumemlock-pc-hostdev-nvme.xml
index 06f1496970..ac20d2b3a0 100644
--- a/tests/qemumemlockdata/qemumemlock-pc-hostdev-nvme.xml
+++ b/tests/qemumemlockdata/qemumemlock-pc-hostdev-nvme.xml
@@ -15,7 +15,6 @@
       <target dev='vda' bus='virtio'/>
     </disk>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemumemlockdata/qemumemlock-pc-hostdev.xml b/tests/qemumemlockdata/qemumemlock-pc-hostdev.xml
index cd517ee226..cc8b6b00ab 100644
--- a/tests/qemumemlockdata/qemumemlock-pc-hostdev.xml
+++ b/tests/qemumemlockdata/qemumemlock-pc-hostdev.xml
@@ -8,7 +8,6 @@
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemumemlockdata/qemumemlock-pc-locked+hostdev.xml b/tests/qemumemlockdata/qemumemlock-pc-locked+hostdev.xml
index da79cb5277..3cbe4a17b3 100644
--- a/tests/qemumemlockdata/qemumemlock-pc-locked+hostdev.xml
+++ b/tests/qemumemlockdata/qemumemlock-pc-locked+hostdev.xml
@@ -11,7 +11,6 @@
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemumemlockdata/qemumemlock-pseries-hardlimit+hostdev.xml b/tests/qemumemlockdata/qemumemlock-pseries-hardlimit+hostdev.xml
index baf0649db7..b9c2aefc28 100644
--- a/tests/qemumemlockdata/qemumemlock-pseries-hardlimit+hostdev.xml
+++ b/tests/qemumemlockdata/qemumemlock-pseries-hardlimit+hostdev.xml
@@ -11,7 +11,6 @@
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemumemlockdata/qemumemlock-pseries-hardlimit+locked+hostdev.xml b/tests/qemumemlockdata/qemumemlock-pseries-hardlimit+locked+hostdev.xml
index 04ae4e93bf..731d4a5392 100644
--- a/tests/qemumemlockdata/qemumemlock-pseries-hardlimit+locked+hostdev.xml
+++ b/tests/qemumemlockdata/qemumemlock-pseries-hardlimit+locked+hostdev.xml
@@ -14,7 +14,6 @@
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemumemlockdata/qemumemlock-pseries-hostdev.xml b/tests/qemumemlockdata/qemumemlock-pseries-hostdev.xml
index a52768cb31..3d016928af 100644
--- a/tests/qemumemlockdata/qemumemlock-pseries-hostdev.xml
+++ b/tests/qemumemlockdata/qemumemlock-pseries-hostdev.xml
@@ -8,7 +8,6 @@
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemumemlockdata/qemumemlock-pseries-locked+hostdev.xml b/tests/qemumemlockdata/qemumemlock-pseries-locked+hostdev.xml
index f5abef0b06..b942fa4834 100644
--- a/tests/qemumemlockdata/qemumemlock-pseries-locked+hostdev.xml
+++ b/tests/qemumemlockdata/qemumemlock-pseries-locked+hostdev.xml
@@ -11,7 +11,6 @@
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxml2xmldata/modern-in.xml
index 67e0aa4952..f0f5df84ab 100644
--- a/tests/qemustatusxml2xmldata/modern-in.xml
+++ b/tests/qemustatusxml2xmldata/modern-in.xml
@@ -502,7 +502,6 @@
         <address type='drive' controller='0' bus='0' target='2' unit='4'/>
       </hostdev>
       <hostdev mode='subsystem' type='pci' managed='yes'>
-        <driver name='vfio'/>
         <source>
           <address domain='0x0005' bus='0x90' slot='0x01' function='0x2'/>
           <origstates>
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.xml b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.xml
index 9a2685ca0e..864ef303c0 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.xml
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.xml
@@ -14,26 +14,22 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x0'/>
       </source>
     </hostdev>
      <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x1'/>
       </source>
       <address type='unassigned'/>
     </hostdev>
    <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x2'/>
       </source>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x3'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.xml b/tests/qemuxml2argvdata/hostdev-pci-multifunction.xml
index 06c889c64d..ba0a593628 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.xml
+++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.xml
@@ -14,43 +14,36 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x0'/>
       </source>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x1'/>
       </source>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x2'/>
       </source>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x3'/>
       </source>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x06' slot='0x12' function='0x1'/>
       </source>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x06' slot='0x12' function='0x2'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml
index b720883913..7afe18b24e 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml
@@ -23,7 +23,6 @@
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0021' bus='222' slot='31' function='1'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.xml
index 49c26e2434..e72c524a98 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.xml
@@ -8,7 +8,6 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -17,7 +16,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.xml
index e74e0116c7..1ed75aae48 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.xml
@@ -8,7 +8,6 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -17,7 +16,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml
index 36161006ab..b4b1ce315f 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml
@@ -8,7 +8,6 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml
index 1e6060345b..fe005af488 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml
@@ -9,7 +9,6 @@
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0xffff' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -18,7 +17,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.xml
index ef5e97fc9c..bb6861f103 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.xml
@@ -8,7 +8,6 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.xml
index 6062ae4940..53cf48ea6a 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.xml
@@ -9,7 +9,6 @@
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -18,7 +17,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-invalid-uid-valid-fid.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-invalid-uid-valid-fid.xml
index 6e7101489e..1026661730 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-invalid-uid-valid-fid.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-invalid-uid-valid-fid.xml
@@ -9,7 +9,6 @@
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml
index da8305dd6d..36c11a8311 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml
@@ -9,7 +9,6 @@
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -18,7 +17,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0002' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -27,20 +25,17 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0003' bus='0x00' slot='0x00' function='0x0'/>
       </source>
     </hostdev>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0004' bus='0x00' slot='0x00' function='0x0'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -49,7 +44,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0006' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -58,7 +52,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0007' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -67,7 +60,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0008' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.xml
index fd3d1193f1..eefe05de39 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.xml
@@ -9,7 +9,6 @@
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.xml
index 6bfbfe611b..fb0e680b55 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.xml
@@ -8,7 +8,6 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <hostdev mode='subsystem' type='pci'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml
index a9a5afd6dd..8b3cc45ddf 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml
@@ -21,7 +21,6 @@
     </disk>
     <controller type='pci' index='0' model='pci-root'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='00' slot='00' function='0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci.xml
index 002b99c52d..5f439eff73 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.xml
@@ -9,7 +9,6 @@
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio.xml b/tests/qemuxml2argvdata/hostdev-vfio.xml
index 1b438a2eef..a03870f6e0 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio.xml
@@ -25,7 +25,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x06' slot='0x12' function='0x1'/>
       </source>
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml
index ae8c4e7e80..cdadf4f2cb 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml
@@ -24,7 +24,6 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='hostdev' managed='yes'>
       <mac address='00:11:22:33:44:55'/>
-      <driver name='vfio'/>
       <source>
         <address type='pci' domain='0x0021' bus='0xde' slot='0x1f' function='0x1'/>
       </source>
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.xml b/tests/qemuxml2argvdata/net-hostdev-vfio.xml
index e6e6b6e5d3..9cdb8a602d 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.xml
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.xml
@@ -24,7 +24,6 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='hostdev' managed='yes'>
       <mac address='00:11:22:33:44:55'/>
-      <driver name='vfio'/>
       <source>
         <address type='pci' domain='0x0000' bus='0x06' slot='0x12' function='0x1'/>
       </source>
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.xml b/tests/qemuxml2argvdata/pseries-hostdevs-1.xml
index 04f3ec4759..5d09413a98 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-1.xml
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-1.xml
@@ -11,7 +11,6 @@
     <!-- This hostdev will cause a new PHB to be created because its
          isolation group is 1 (IOMMU group 0) -->
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
@@ -19,7 +18,6 @@
     <!-- This hostdev can't share the PHB that was just created, because
          its isolation group is 2 (IOMMU group 1) -->
     <interface type='hostdev' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address type='pci' domain='0x0005' bus='0x90' slot='0x01' function='0x0'/>
       </source>
@@ -28,7 +26,6 @@
     <!-- This hostdev will be placed on the first PHB, since its isolation
          group is 1 (IOMMU group 0) just like the first hostdev -->
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x1'/>
       </source>
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.xml b/tests/qemuxml2argvdata/pseries-hostdevs-2.xml
index 6568475c72..00d4228499 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-2.xml
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-2.xml
@@ -17,7 +17,6 @@
          despite being in the separate isolation group 1 (IOMMU group 0),
          because the address has been requested explicitly by the user -->
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
@@ -26,7 +25,6 @@
     <!-- This hostdev can use neither the PHB that was just created, nor the
          default one, because it's in isolation group 2 (IOMMU group 1) -->
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.xml b/tests/qemuxml2argvdata/pseries-hostdevs-3.xml
index 4f51f48c90..64ba95ca30 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-3.xml
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-3.xml
@@ -11,7 +11,6 @@
     <!-- This hostdev will cause a new PHB to be created because its isolation
          group is 1 (IOMMU group 0). It will be PHB 2 due to the address -->
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
@@ -20,7 +19,6 @@
     <!-- This hostdev will be placed on the same PHB, since its isolation
          group is also 1 (IOMMU group 0) -->
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x1'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.x86_64-latest.xml
index 480d2f8363..9da9a8a07e 100644
--- a/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.x86_64-latest.xml
@@ -28,28 +28,24 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x0'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x1'/>
       </source>
       <address type='unassigned'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x2'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x3'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.x86_64-latest.xml
index a29a27e85b..9530c28e14 100644
--- a/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.x86_64-latest.xml
@@ -28,49 +28,42 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x0'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x1'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x2'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x3'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x06' slot='0x12' function='0x1'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x06' slot='0x12' function='0x2'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-old-driver-name.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-old-driver-name.x86_64-latest.xml
new file mode 100644
index 0000000000..3915b515f2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-old-driver-name.x86_64-latest.xml
@@ -0,0 +1,46 @@
+<domain type='qemu'>
+  <name>QEMUGuest2</name>
+  <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219100</memory>
+  <currentMemory unit='KiB'>219100</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</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'/>
+    </disk>
+    <controller type='usb' index='0' model='piix3-uhci'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='ide' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
+    <hostdev mode='subsystem' type='pci' managed='yes'>
+      <source>
+        <address domain='0x0000' bus='0x06' slot='0x12' function='0x1'/>
+      </source>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </hostdev>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml
index dd1dea4e99..f23ad5b90c 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml
@@ -20,7 +20,6 @@
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -29,7 +28,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml
index 1a52487692..9bf2ce32be 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml
@@ -20,7 +20,6 @@
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -29,7 +28,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.s390x-latest.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.s390x-latest.xml
index 670f8c68b4..94f3c04b9a 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.s390x-latest.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.s390x-latest.xml
@@ -20,7 +20,6 @@
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.s390x-latest.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.s390x-latest.xml
index df55f79501..8b0044af1c 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.s390x-latest.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.s390x-latest.xml
@@ -25,7 +25,6 @@
     </controller>
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0xffff' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -34,7 +33,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml
index 7df6491b68..e0ff360553 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml
@@ -18,7 +18,6 @@
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.xml
index e64d7de561..70d592f2df 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.xml
@@ -20,7 +20,6 @@
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -29,7 +28,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0002' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -38,7 +36,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0003' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -47,7 +44,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0004' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -56,7 +52,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -65,7 +60,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0006' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -74,7 +68,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0007' bus='0x00' slot='0x00' function='0x0'/>
       </source>
@@ -83,7 +76,6 @@
       </address>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0008' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.s390x-latest.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.s390x-latest.xml
index 5e14a63810..c8a1407427 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.s390x-latest.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.s390x-latest.xml
@@ -20,7 +20,6 @@
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hostdev-vfio.x86_64-latest.xml
index b660d245a1..3915b515f2 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio.x86_64-latest.xml
@@ -34,7 +34,6 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x06' slot='0x12' function='0x1'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-vfio.x86_64-latest.xml b/tests/qemuxml2xmloutdata/net-hostdev-vfio.x86_64-latest.xml
index 167e1b1fea..1eee425593 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev-vfio.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev-vfio.x86_64-latest.xml
@@ -32,7 +32,6 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='hostdev' managed='yes'>
       <mac address='00:11:22:33:44:55'/>
-      <driver name='vfio'/>
       <source>
         <address type='pci' domain='0x0000' bus='0x06' slot='0x12' function='0x1'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/pseries-hostdevs-1.ppc64-latest.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-1.ppc64-latest.xml
index db369a1fc7..d0ad114d34 100644
--- a/tests/qemuxml2xmloutdata/pseries-hostdevs-1.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/pseries-hostdevs-1.ppc64-latest.xml
@@ -32,7 +32,6 @@
     </controller>
     <interface type='hostdev' managed='yes'>
       <mac address='52:54:00:6d:90:02'/>
-      <driver name='vfio'/>
       <source>
         <address type='pci' domain='0x0005' bus='0x90' slot='0x01' function='0x0'/>
       </source>
@@ -40,14 +39,12 @@
     </interface>
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x1'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/pseries-hostdevs-2.ppc64-latest.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-2.ppc64-latest.xml
index 09b657698d..4ffcae80b8 100644
--- a/tests/qemuxml2xmloutdata/pseries-hostdevs-2.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/pseries-hostdevs-2.ppc64-latest.xml
@@ -35,14 +35,12 @@
     </controller>
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x01' slot='0x02' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01' function='0x0'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/pseries-hostdevs-3.ppc64-latest.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-3.ppc64-latest.xml
index 58ffb09c3b..e06901a9a4 100644
--- a/tests/qemuxml2xmloutdata/pseries-hostdevs-3.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/pseries-hostdevs-3.ppc64-latest.xml
@@ -32,14 +32,12 @@
     </controller>
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x0'/>
       </source>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
-      <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00' function='0x1'/>
       </source>