From nobody Mon Feb  9 09:33:00 2026
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.133.124 as permitted sender) client-ip=170.10.133.124;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-124.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1698036907; cv=none;
	d=zohomail.com; s=zohoarc;
	b=jU483Yt1iIn/8Dw5Ex0DY5ZGnyeha8pyGJre2mx2naPCHxf1EUd4bkyKmFORT4h8+M9dLmZdO9Hw5H0bAqL1fVov3SAC5Tq+Hwq3Z0hWw0IPhbw3B+D3FPRw8L56q2cpAqTZ08QtxIobNXflDaMfjCP5y+WFoteMh5z4w7kjaZU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1698036907;
 h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
	bh=0OMCoq7tUqkvkSON9YP+BfgikJxL/PAslrcOaGw88B4=;
	b=lsGAvOxXvBFcVCfR+YH1b1I+iydtCN1erabPaRRoILCGyjrqAYK7G78woW40uiKWGU4/ckKgXR9rnn1W7vi2lihx6PKVv7cDF2LnPWhCrXHPh7h1dyZjhPEgsVmGOLQ8Q21akiSgOX17/dsvhnbR6rS0LDDJgAjXDMzaPSf18LM=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<laine@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com
	with SMTPS id 1698036907713177.24899673043512;
 Sun, 22 Oct 2023 21:55:07 -0700 (PDT)
Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])
 by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-654-0LRh4MNvOJuWlfaGj6vR0w-1; Mon, 23 Oct 2023 00:55:02 -0400
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com
 [10.11.54.5])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D56DD3C170A1;
	Mon, 23 Oct 2023 04:54:57 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id B9BFE1120F;
	Mon, 23 Oct 2023 04:54:57 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (localhost [IPv6:::1])
	by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 5A27619466E7;
	Mon, 23 Oct 2023 04:54:56 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com
 [10.11.54.8])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id A7C4F194658F for <libvir-list@listman.corp.redhat.com>;
 Mon, 23 Oct 2023 04:54:54 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 8758FC15975; Mon, 23 Oct 2023 04:54:54 +0000 (UTC)
Received: from vhost3.router.laine.org (unknown [10.22.8.125])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 4EAA6C15BB8;
 Mon, 23 Oct 2023 04:54:54 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1698036906;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:cc:mime-version:mime-version:
	 content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=0OMCoq7tUqkvkSON9YP+BfgikJxL/PAslrcOaGw88B4=;
	b=FqC+icBR3ZHi01ab/96C/Y+5ulIEhuwfz1/eGlluc5z5ZbBmDYMVHGGI2vtg9/+f/vZHi5
	uh/qR4QoKs2aEsXc52aCmQkslLfYAUEC8Jh+vfe4evBxF3obSVgedWEsPkUTXRXQXsY2Z3
	kGIUsrcNtoQSJWeV3vpqsscSf4eGnkk=
X-MC-Unique: 0LRh4MNvOJuWlfaGj6vR0w-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Laine Stump <laine@redhat.com>
To: libvir-list@redhat.com
Subject: [libvirt PATCH 09/15] tests: remove explicit <driver name='vfio'/>
 from hostdev test cases
Date: Mon, 23 Oct 2023 00:54:45 -0400
Message-ID: <20231023045451.210711-10-laine@redhat.com>
In-Reply-To: <20231023045451.210711-1-laine@redhat.com>
References: <20231023045451.210711-1-laine@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Cc: Joao Martins <joao.m.martins@oracle.com>,
 Cedric Le Goater <clegoate@redhat.com>, Jason Gunthorpe <jgg@nvidia.com>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1698036909377100003
Content-Type: text/plain; charset="utf-8"; x-default="true"

The long-deprecated use of <driver name=3D'vfio|xen|kvm'/> in domain xml
for <hostdev> devices was only ever necessary during the period when
libvirt supported both VFIO and "legacy KVM" styles of hostdev device
assignment in the QEMU driver. This became unnecessary many years ago
(circa RHEL6!) 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=3D'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=3D'vfio' in all QEMU unit test data,
proving that the attribute is no longer (externally) needed while also
making it simpler to properly test when a later patch "re-animates"
the driver name attribute for a slightly different (but related) use.

Signed-off-by: Laine Stump <laine@redhat.com>
---
 tests/qemuxml2argvdata/hostdev-pci-address-unassigned.xml | 4 ----
 tests/qemuxml2argvdata/hostdev-pci-multifunction.xml      | 7 -------
 tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml       | 1 -
 .../hostdev-vfio-zpci-autogenerate-fids.xml               | 2 --
 .../hostdev-vfio-zpci-autogenerate-uids.xml               | 2 --
 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml | 1 -
 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml   | 2 --
 .../qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.xml | 1 -
 tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.xml    | 2 --
 .../hostdev-vfio-zpci-invalid-uid-valid-fid.xml           | 1 -
 .../hostdev-vfio-zpci-multidomain-many.xml                | 8 --------
 tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.xml     | 1 -
 tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.xml | 1 -
 tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml   | 1 -
 tests/qemuxml2argvdata/hostdev-vfio-zpci.xml              | 1 -
 tests/qemuxml2argvdata/hostdev-vfio.xml                   | 1 -
 tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml   | 1 -
 tests/qemuxml2argvdata/net-hostdev-vfio.xml               | 1 -
 tests/qemuxml2argvdata/pseries-hostdevs-1.xml             | 3 ---
 tests/qemuxml2argvdata/pseries-hostdevs-2.xml             | 2 --
 tests/qemuxml2argvdata/pseries-hostdevs-3.xml             | 2 --
 .../hostdev-pci-address-unassigned.x86_64-latest.xml      | 4 ----
 .../hostdev-pci-multifunction.x86_64-latest.xml           | 7 -------
 .../hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml  | 2 --
 .../hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml  | 2 --
 .../hostdev-vfio-zpci-autogenerate.s390x-latest.xml       | 1 -
 .../hostdev-vfio-zpci-boundaries.s390x-latest.xml         | 2 --
 .../hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml     | 1 -
 .../hostdev-vfio-zpci-multidomain-many.s390x-latest.xml   | 8 --------
 .../qemuxml2xmloutdata/hostdev-vfio-zpci.s390x-latest.xml | 1 -
 tests/qemuxml2xmloutdata/hostdev-vfio.x86_64-latest.xml   | 1 -
 .../qemuxml2xmloutdata/net-hostdev-vfio.x86_64-latest.xml | 1 -
 .../pseries-hostdevs-1.ppc64-latest.xml                   | 3 ---
 .../pseries-hostdevs-2.ppc64-latest.xml                   | 2 --
 .../pseries-hostdevs-3.ppc64-latest.xml                   | 2 --
 35 files changed, 82 deletions(-)

diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.xml b/te=
sts/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=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x0'/>
       </source>
     </hostdev>
      <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x1'/>
       </source>
       <address type=3D'unassigned'/>
     </hostdev>
    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x2'/>
       </source>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x3'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.xml b/tests/q=
emuxml2argvdata/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=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x0'/>
       </source>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x1'/>
       </source>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x2'/>
       </source>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x3'/>
       </source>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x06' slot=3D'0x12' function=3D'=
0x1'/>
       </source>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x06' slot=3D'0x12' function=3D'=
0x2'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml b/tests/qe=
muxml2argvdata/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=3D'ide' index=3D'0'/>
     <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0021' bus=3D'222' slot=3D'31' function=3D'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=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -17,7 +16,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x00' slot=3D'0x00' function=3D'=
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=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -17,7 +16,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' function=3D'=
0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml b/te=
sts/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=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml b/test=
s/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=3D'pci' index=3D'0' model=3D'pci-root'/>
     <hostdev mode=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0xffff' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -18,7 +17,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
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=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
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=3D'pci' index=3D'0' model=3D'pci-root'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -18,7 +17,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x00' slot=3D'0x00' function=3D'=
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=3D'pci' index=3D'0' model=3D'pci-root'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
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=3D'pci' index=3D'0' model=3D'pci-root'/>
     <hostdev mode=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -18,7 +17,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0002' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -27,20 +25,17 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0003' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0004' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -49,7 +44,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0006' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -58,7 +52,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0007' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -67,7 +60,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0008' bus=3D'0x00' slot=3D'0x00' function=3D'=
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=3D'pci' index=3D'0' model=3D'pci-root'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.xml b/te=
sts/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=3D'subsystem' type=3D'pci'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml b/test=
s/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=3D'pci' index=3D'0' model=3D'pci-root'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'00' slot=3D'00' function=3D'0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.xml b/tests/qemuxml2a=
rgvdata/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=3D'pci' index=3D'0' model=3D'pci-root'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio.xml b/tests/qemuxml2argvda=
ta/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=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x06' slot=3D'0x12' function=3D'=
0x1'/>
       </source>
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml b/test=
s/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=3D'pci' index=3D'0' model=3D'pci-root'/>
     <interface type=3D'hostdev' managed=3D'yes'>
       <mac address=3D'00:11:22:33:44:55'/>
-      <driver name=3D'vfio'/>
       <source>
         <address type=3D'pci' domain=3D'0x0021' bus=3D'0xde' slot=3D'0x1f'=
 function=3D'0x1'/>
       </source>
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.xml b/tests/qemuxml2ar=
gvdata/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=3D'pci' index=3D'0' model=3D'pci-root'/>
     <interface type=3D'hostdev' managed=3D'yes'>
       <mac address=3D'00:11:22:33:44:55'/>
-      <driver name=3D'vfio'/>
       <source>
         <address type=3D'pci' domain=3D'0x0000' bus=3D'0x06' slot=3D'0x12'=
 function=3D'0x1'/>
       </source>
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.xml b/tests/qemuxml2=
argvdata/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=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
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=3D'hostdev' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address type=3D'pci' domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01'=
 function=3D'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=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x1'/>
       </source>
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.xml b/tests/qemuxml2=
argvdata/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=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -26,7 +25,6 @@
     <!-- This hostdev can use neither the PHB that was just created, nor t=
he
          default one, because it's in isolation group 2 (IOMMU group 1) -->
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x0'/>
       </source>
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.xml b/tests/qemuxml2=
argvdata/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 isola=
tion
          group is 1 (IOMMU group 0). It will be PHB 2 due to the address -=
->
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
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=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x1'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.x86_64=
-latest.xml b/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.x86_6=
4-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=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x0'/>
       </source>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x1'/>
       </source>
       <address type=3D'unassigned'/>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x2'/>
       </source>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x3'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.x86_64-latest.x=
ml
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=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x0'/>
       </source>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x1'/>
       </source>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x2'/>
       </source>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x3'/>
       </source>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x06' slot=3D'0x12' function=3D'=
0x1'/>
       </source>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' f=
unction=3D'0x0'/>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x06' slot=3D'0x12' function=3D'=
0x2'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.s=
390x-latest.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-f=
ids.s390x-latest.xml
index dd1dea4e99..f23ad5b90c 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.s390x-la=
test.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.s390x-la=
test.xml
@@ -20,7 +20,6 @@
     <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
     <audio id=3D'1' type=3D'none'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -29,7 +28,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.s=
390x-latest.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-u=
ids.s390x-latest.xml
index 1a52487692..9bf2ce32be 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.s390x-la=
test.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.s390x-la=
test.xml
@@ -20,7 +20,6 @@
     <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
     <audio id=3D'1' type=3D'none'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -29,7 +28,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' function=3D'=
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=3D'pci' index=3D'0' model=3D'pci-root'/>
     <audio id=3D'1' type=3D'none'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.s390x-la=
test.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.s390x-late=
st.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=3D'1' type=3D'none'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0xffff' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -34,7 +33,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s390=
x-latest.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s3=
90x-latest.xml
index 7df6491b68..e0ff360553 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s390x-lates=
t.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s390x-lates=
t.xml
@@ -18,7 +18,6 @@
     <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
     <audio id=3D'1' type=3D'none'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.s3=
90x-latest.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-man=
y.s390x-latest.xml
index e64d7de561..70d592f2df 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.s390x-lat=
est.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.s390x-lat=
est.xml
@@ -20,7 +20,6 @@
     <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
     <audio id=3D'1' type=3D'none'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -29,7 +28,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0002' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -38,7 +36,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0003' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -47,7 +44,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0004' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -56,7 +52,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -65,7 +60,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0006' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -74,7 +68,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0007' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
@@ -83,7 +76,6 @@
       </address>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0008' bus=3D'0x00' slot=3D'0x00' function=3D'=
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=3D'pci' index=3D'0' model=3D'pci-root'/>
     <audio id=3D'1' type=3D'none'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'no'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x00' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio.x86_64-latest.xml b/test=
s/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=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0000' bus=3D'0x06' slot=3D'0x12' function=3D'=
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=3D'pci' index=3D'0' model=3D'pci-root'/>
     <interface type=3D'hostdev' managed=3D'yes'>
       <mac address=3D'00:11:22:33:44:55'/>
-      <driver name=3D'vfio'/>
       <source>
         <address type=3D'pci' domain=3D'0x0000' bus=3D'0x06' slot=3D'0x12'=
 function=3D'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=3D'hostdev' managed=3D'yes'>
       <mac address=3D'52:54:00:6d:90:02'/>
-      <driver name=3D'vfio'/>
       <source>
         <address type=3D'pci' domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01'=
 function=3D'0x0'/>
       </source>
@@ -40,14 +39,12 @@
     </interface>
     <audio id=3D'1' type=3D'none'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x01' f=
unction=3D'0x0'/>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
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=3D'1' type=3D'none'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x02' f=
unction=3D'0x0'/>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
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=3D'1' type=3D'none'/>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x0'/>
       </source>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x01' f=
unction=3D'0x0'/>
     </hostdev>
     <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
-      <driver name=3D'vfio'/>
       <source>
         <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x1'/>
       </source>
--=20
2.41.0