tests: remove explicit <driver name='vfio'/> from hostdev test cases

The long-deprecated use of <driver name='vfio|xen|kvm'/> in domain xml
for <hostdev> devices was only ever necessary during the period when
libvirt (and the Linux kernel) supported both VFIO and "legacy KVM"
styles of hostdev device assignment for QEMU. This became pointless
many years ago when legacy KVM device assignment was removed from the
kernel, and support for that style of device assignment was completely
disabled in the libvirt source in 2019 (commit
v5.6.0-316-g2e7225ea8c).

Nevertheless, there were instances of <driver name='vfio'/> in the
unit test data that were then (unnecessarily) propagated to several
more tests over the years. This patch cleans out those unnecessary
explicit settings of driver name='vfio' in all QEMU unit test data,
proving that the attribute is no longer (externally) needed. (A later
patch which adds a 2nd attribute to the <driver> element will include
a test case that explicitly exercises the driver name attribute).

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 96e03a3807cca83adbc9da42689950740db455b8..252ba7c17c7063cfccfd60513c257b3b66b0f4f2 100644 (file)
--- 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 c54d53070ae790769d85d2b407fa05f755584a13..5d300a035e3c6aebd5a5f104bac4b85e3740a3bb 100644 (file)
--- 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 40a4f0e85b1727e4f03c786596e6048d4d0c1f88..e60445b3b4fdbf6b3f30e0902c04c0f916d337a8 100644 (file)
--- 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 eb4945f1692e74d7705865f700edb66ae5a1e2f2..bfc0bbccc35d42c42daaa0300a86e54687f6ec80 100644 (file)
--- 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 5b8f59858c7d5fb5d2a960c0cb9cd72fec6abd1a..7bf857d3a1008bfa660477ad644e0a8b94701cce 100644 (file)
--- 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 5b8f59858c7d5fb5d2a960c0cb9cd72fec6abd1a..7bf857d3a1008bfa660477ad644e0a8b94701cce 100644 (file)
--- 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 6f7c99c943cfbd2b585a23876ee2ab3516170948..0d6dec9d262d2009105a73e13c2adbf9359ee97a 100644 (file)
--- 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 e03f5a585d653f851e959486ce076acb17af16d1..18bafaa355977d6d361561f22aeab342ab2c1974 100644 (file)
--- 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 7070e5a12c82497324e700499901274dcc1a2aa4..34a3960e8b0e18afad23e61b0aac3dc2acdd16e3 100644 (file)
--- 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 06f1496970550572edd251b6e477b625dcaf5708..ac20d2b3a0ab0849d3cd864020b163f0ec467313 100644 (file)
--- 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 cd517ee226b1b71d8f1cc2a6e51a6d7a723b8d26..cc8b6b00ab1884642e30b785e70fc4fc4ac03164 100644 (file)
--- 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 da79cb5277c5d75fff27397fdc3d767b3981770b..3cbe4a17b3502066f34f36d0ba2facf1cffbf686 100644 (file)
--- 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 baf0649db70c9a006be11f69bcd2eef9b5108627..b9c2aefc285f9b1ca999fb36e2b4cf2575b54215 100644 (file)
--- 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 04ae4e93bf30d9fff7f8b11befb3d8fd5b61e90d..731d4a53927593bd4bb43a6b8f37e01d64b9564e 100644 (file)
--- 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 a52768cb31cfdd263562a261a6e22c34b3b7fa16..3d016928afe62c6fabdb76f03a10b83daf697fc0 100644 (file)
--- 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 f5abef0b063e0dbb7315d048c5896f57ddfa45b7..b942fa483413b8080133197e3e964da7676ef3f6 100644 (file)
--- 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 67e0aa4952feb4b1172a7bb89c5f71d3c6c3e096..f0f5df84ab20483d874a8dec8fe0dd75386424ba 100644 (file)
--- 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 9a2685ca0ef66914b1acc6da3c4d89c95a68f1bf..864ef303c018169c7c9941a0439a347d4399ec39 100644 (file)
--- 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 06c889c64dac74bc4f2114f8a94a99178ceaed39..ba0a5936289dcd82977f85813a0d5b1a96a9c83c 100644 (file)
--- 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 b720883913a70f7aa05540a8d5a9a123417b93e0..7afe18b24e2fd3b07f0a88777d689b510dcefba6 100644 (file)
--- 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 49c26e2434e2fc75626f5b00387198e0c6052663..e72c524a98340905643811a9e1926b54a419bb9e 100644 (file)
--- 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 e74e0116c781eb029376a653b56546f56972afe3..1ed75aae4833e48c760c6f580b7d139622583ca0 100644 (file)
--- 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 36161006abca5cb27502949f6ce0fbaf5904ab06..b4b1ce315f3fe38629b24ce65d3e62dec95f2288 100644 (file)
--- 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 1e6060345baca3ede936ed3980dbdd32d5792f35..fe005af4883de9371530154ad9e6036bfd4dc84d 100644 (file)
--- 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 ef5e97fc9cacd886990527cc7a42ee9eacfcdc80..bb6861f103f8357174b1b98e7e9b91b4e1e70114 100644 (file)
--- 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 6062ae49401235c636be6698b0edf5908658998a..53cf48ea6a1d3df128ff00878f74e0e5de852f8f 100644 (file)
--- 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 6e7101489e106039b69c51a1e9ff317982e5c9c2..1026661730c26ba764e1e78d97fbaa3f0c639bc3 100644 (file)
--- 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 da8305dd6d1b419b83ff86dbd738ce5a950081aa..36c11a83115d78ae1597c55881df49e7e59c051c 100644 (file)
--- 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 fd3d1193f1044ff59e6655c5fe20c4a09348ac87..eefe05de39de3f4724c825c3885ea2f192ff419a 100644 (file)
--- 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 6bfbfe611b5c1e2b424b89e0b400dd6b8225e293..fb0e680b55560e42665b97619e8e51b78fc7fcf1 100644 (file)
--- 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 a9a5afd6dd5f1923b63979fc1564b9e09b2a8fb8..8b3cc45ddf8182d3df6af858fa498a010b2c6c4b 100644 (file)
--- 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 002b99c52d8af75ac979c4b6f134edd4c8131737..5f439eff73df061d62696284c3bb4779c409968b 100644 (file)
--- 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 1b438a2eef69f7d424a9b62037d4860f286ad319..a03870f6e0b437db83be55b517b342dfb2058626 100644 (file)
--- 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 ae8c4e7e808c48ab045067274f3d83b6825c7315..cdadf4f2cbfb0877bd5c427a78d09474b1397c2c 100644 (file)
--- 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 e6e6b6e5d35904a7dc9ed1a59671565448053890..9cdb8a602d5dd65123fa25ff28cacb99e8e6a9c6 100644 (file)
--- 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 04f3ec4759f1cfc39f4d1a4210856404cb53b7c8..5d09413a987dd04eb7d77edfcf840d3d62f50dd8 100644 (file)
--- 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 6568475c722b2264693c7c59852afa02503e30ac..00d4228499a19856025718523e4e6b6c0b3d1772 100644 (file)
--- 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 4f51f48c90dc35587bb646d66f898b595594acba..64ba95ca3031cef4882e2f7517190a5bb55b478e 100644 (file)
--- 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 480d2f83630bfa89fe3e68f4bc6d22b67c9c603d..9da9a8a07eb09fd27ff677008061ad0cb00dbb52 100644 (file)
--- 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 a29a27e85b2539b41073287822d7535a46890a27..9530c28e141cec8be7d865307ae141a1bb4b763f 100644 (file)
--- 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 (file)
index 0000000..3915b51
--- /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 dd1dea4e991fb4a3cd1c577cc1e2c7703f9d4393..f23ad5b90cf51325ec26f1d16fa54e17c2b02098 100644 (file)
--- 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 1a52487692ec104214505b51d345de549272a15b..9bf2ce32be4af3777659b960ee04864ed60fe735 100644 (file)
--- 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 670f8c68b450cc805d17a2565ad727e90fcbdc06..94f3c04b9aa6a35e38a054b91d7cce7af778efe9 100644 (file)
--- 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 df55f7950190fffaa5a26d98a7ae470d5c8a9ecf..8b0044af1c57a7bbc161a09027f6e3cdafc429b6 100644 (file)
--- 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 7df6491b6834aeb3d7fb9e3879485594406f94ca..e0ff360553928790745159f658f04f46fffda068 100644 (file)
--- 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 e64d7de561d01147cb90cd08ef9a1a0213ec0a2f..70d592f2df36934b9baaf87c4e2cd54c150ae365 100644 (file)
--- 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 5e14a6381002045bba36f793957069bd91e5a908..c8a1407427a3af6ba52968061ce060fb896d0778 100644 (file)
--- 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 b660d245a1ad5451e6ba7fd05d0878159f3a6291..3915b515f286f8b026fcfc7665036a1b5c275cf3 100644 (file)
--- 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 167e1b1feab9bb8d098a27f15834acee2ce9260c..1eee425593e7b0e49d05b56fd9daf4c7acd8e67e 100644 (file)
--- 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 db369a1fc719f1131185955683ad52ecce25b016..d0ad114d340060b7d007c94b4b43670ddd3317a2 100644 (file)
--- 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 09b657698db3ec3317c959a8cd95ac71755e9a0a..4ffcae80b8ffef6cd238654aedf9fe4bf5594555 100644 (file)
--- 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 58ffb09c3b18d17aa12f10d4331844a499aac136..e06901a9a4b256484ede1ede8a4fed0ac2dc52f5 100644 (file)
--- 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>