From nobody Sun May  5 08:36:50 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 205.139.110.61 as permitted sender) client-ip=205.139.110.61;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail(p=none dis=none)  header.from=linux.ibm.com
ARC-Seal: i=1; a=rsa-sha256; t=1587647740; cv=none;
	d=zohomail.com; s=zohoarc;
	b=S3JwMMOvOoU52vFlW68yDzh9+LltF/gENpCs1PHC3mBN6q8Rd6hmfr038TAsMs61zxEoezSsm8rPM0cPXLwpdYQxNNs4o0550pvHMlhjCQQDTbvqNo4oUuirXGqYLdGraRBfkAauMAU6cgXYyiTerZ11bwqAoDfV0ZagnYcjbHU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1587647740;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=SXoYcURYtwuqx1w0x/gASSk5E53vTVsxmosNYfQDjwU=;
	b=HcM8cmF+9WhmEsBEf3K6f+d2L5W58F/Esab5GCxjLJMynrj/ERZwfDrOayPX8Z7tmoTApnIz8BSGo49L/RZwqOlkEhhCffa/Z4l4l8Ntuh+Bz87vGWxpnFpmPM4rOgDpy/g4e60Hak/MxKFd1ABX4k+KhluL/rDDeptw2mojXwU=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail header.from=<bwalk@linux.ibm.com> (p=none dis=none)
 header.from=<bwalk@linux.ibm.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com
 [205.139.110.61]) by mx.zohomail.com
	with SMTPS id 1587647740623689.3665594672593;
 Thu, 23 Apr 2020 06:15:40 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-294-rZqx5uJjPFuX4bYC7U2Qbg-1; Thu, 23 Apr 2020 09:15:36 -0400
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EBB11895951;
	Thu, 23 Apr 2020 13:15:30 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 54AFD60605;
	Thu, 23 Apr 2020 13:15:30 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 505DE1809543;
	Thu, 23 Apr 2020 13:15:27 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
	[10.11.54.4])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 03NDFOcK032166 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 23 Apr 2020 09:15:25 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id D20072026E04; Thu, 23 Apr 2020 13:15:24 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id CDBB12026DFD
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 13:15:22 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B5058811E7A
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 13:15:22 +0000 (UTC)
Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com
	[148.163.156.1]) (Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-475-Rw9g1eNSPE6TK0cdXWUZEA-1; Thu, 23 Apr 2020 09:15:20 -0400
Received: from pps.filterd (m0098409.ppops.net [127.0.0.1])
	by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id
	03ND2Uxu175725
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 09:15:19 -0400
Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97])
	by mx0a-001b2d01.pphosted.com with ESMTP id 30gmvk9xnq-1
	(version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT)
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 09:15:18 -0400
Received: from localhost
	by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use
	Only! Violators will be prosecuted
	for <libvir-list@redhat.com> from <bwalk@linux.ibm.com>;
	Thu, 23 Apr 2020 14:14:29 +0100
Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197)
	by e06smtp01.uk.ibm.com (192.168.101.131) with IBM ESMTP SMTP Gateway:
	Authorized Use Only! Violators will be prosecuted;
	(version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256)
	Thu, 23 Apr 2020 14:14:27 +0100
Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com
	[9.149.105.232])
	by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with
	ESMTP id 03NDFDg961472796
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256
	verify=OK); Thu, 23 Apr 2020 13:15:13 GMT
Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1])
	by IMSVA (Postfix) with ESMTP id DB1DF52057;
	Thu, 23 Apr 2020 13:15:12 +0000 (GMT)
Received: from m46lp64.lnxne.boe (unknown [9.152.108.100])
	by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id BCD5E5204F;
	Thu, 23 Apr 2020 13:15:12 +0000 (GMT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1587647739;
	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=SXoYcURYtwuqx1w0x/gASSk5E53vTVsxmosNYfQDjwU=;
	b=UllyF1Y/7OmrEZgO+r7UugLr6Zok94e4SLpqF045iKwHzPU3bHAyb+y8ovIYjag8f/cjY2
	cxLMSq54hErL/bNxWh1LS1zo28BRlTb5OlMqaaotN3V2NiWGsnVxYPm0DUZG/RyFOj1rBa
	9pOx2Ak00BmDY95uzRoV1Hz/8kmXk/M=
X-MC-Unique: rZqx5uJjPFuX4bYC7U2Qbg-1
X-MC-Unique: Rw9g1eNSPE6TK0cdXWUZEA-1
From: Bjoern Walk <bwalk@linux.ibm.com>
To: libvir-list@redhat.com
Subject: [PATCH 1/4] tests: use latest caps for virtio-options test
Date: Thu, 23 Apr 2020 15:15:06 +0200
In-Reply-To: <20200423131509.2708173-1-bwalk@linux.ibm.com>
References: <20200423131509.2708173-1-bwalk@linux.ibm.com>
MIME-Version: 1.0
X-TM-AS-GCONF: 00
x-cbid: 20042313-4275-0000-0000-000003C53C58
X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused
x-cbparentid: 20042313-4276-0000-0000-000038DAC717
Message-Id: <20200423131509.2708173-2-bwalk@linux.ibm.com>
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676
	definitions=2020-04-23_10:2020-04-22,
	2020-04-23 signatures=0
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0
	priorityscore=1501
	bulkscore=0 malwarescore=0 impostorscore=0 suspectscore=1 phishscore=0
	adultscore=0 mlxlogscore=999 clxscore=1015 mlxscore=0 spamscore=0
	lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1
	engine=8.12.0-2003020000 definitions=main-2004230099
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4
X-MIME-Autoconverted: from quoted-printable to 8bit by
	lists01.pubmisc.prod.ext.phx2.redhat.com id 03NDFOcK032166
X-loop: libvir-list@redhat.com
Cc: Bjoern Walk <bwalk@linux.ibm.com>,
	Daniel Henrique Barboza <danielhb413@gmail.com>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.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://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
Content-Type: text/plain; charset="utf-8"

Convert the virtio-options test in qemuxml2argv and qemuxml2xml to use
the latest available QEMU capabilities.

Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Signed-off-by: Bjoern Walk <bwalk@linux.ibm.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
 .../virtio-options.x86_64-latest.args         | 69 +++++++++++++++++++
 tests/qemuxml2argvdata/virtio-options.xml     |  5 +-
 tests/qemuxml2argvtest.c                      | 12 +---
 .../virtio-options.x86_64-latest.xml          |  1 +
 tests/qemuxml2xmltest.c                       | 16 +----
 5 files changed, 76 insertions(+), 27 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/virtio-options.x86_64-latest.args
 create mode 120000 tests/qemuxml2xmloutdata/virtio-options.x86_64-latest.x=
ml

diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tes=
ts/qemuxml2argvdata/virtio-options.x86_64-latest.args
new file mode 100644
index 00000000..e523f73f
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args
@@ -0,0 +1,69 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3DQEMUGuest1,debug-threads=3Don \
+-S \
+-object secret,id=3DmasterKey0,format=3Draw,\
+file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-cpu qemu64 \
+-m 214 \
+-overcommit mem-lock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-boot strict=3Don \
+-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
+-device virtio-scsi-pci,iommu_platform=3Don,ats=3Don,packed=3Don,id=3Dscsi=
0,bus=3Dpci.0,\
+addr=3D0x8 \
+-device virtio-serial-pci,id=3Dvirtio-serial0,iommu_platform=3Don,ats=3Don=
,packed=3Don,\
+bus=3Dpci.0,addr=3D0x9 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1",\
+"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw=
",\
+"file":"libvirt-1-storage"}' \
+-device virtio-blk-pci,scsi=3Doff,iommu_platform=3Don,ats=3Don,packed=3Don=
,bus=3Dpci.0,\
+addr=3D0xa,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,bootindex=3D1 \
+-fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs=
1 \
+-device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Dfs1,iommu_pla=
tform=3Don,\
+ats=3Don,packed=3Don,bus=3Dpci.0,addr=3D0x3 \
+-fsdev local,security_model=3Dmapped,writeout=3Dimmediate,id=3Dfsdev-fs1,\
+path=3D/export/fs2 \
+-device virtio-9p-pci,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3Dfs2,iommu_pla=
tform=3Don,\
+ats=3Don,packed=3Don,bus=3Dpci.0,addr=3D0x4 \
+-netdev user,id=3Dhostnet0 \
+-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:56:58:5a:5c=
,bus=3Dpci.0,\
+addr=3D0x6,iommu_platform=3Don,ats=3Don,packed=3Don \
+-device virtio-mouse-pci,id=3Dinput0,bus=3Dpci.0,addr=3D0xe,iommu_platform=
=3Don,ats=3Don,\
+packed=3Don \
+-device virtio-keyboard-pci,id=3Dinput1,bus=3Dpci.0,addr=3D0x10,iommu_plat=
form=3Don,\
+ats=3Don,packed=3Don \
+-device virtio-tablet-pci,id=3Dinput2,bus=3Dpci.0,addr=3D0x11,iommu_platfo=
rm=3Don,\
+ats=3Don,packed=3Don \
+-device virtio-input-host-pci,id=3Dinput3,evdev=3D/dev/input/event1234,bus=
=3Dpci.0,\
+addr=3D0x12,iommu_platform=3Don,ats=3Don,packed=3Don \
+-chardev socket,id=3Dchr-vu-video0,fd=3D1729 \
+-device vhost-user-vga,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-video0=
,bus=3Dpci.0,\
+addr=3D0x2,iommu_platform=3Don,ats=3Don,packed=3Don \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0xc,iommu_plat=
form=3Don,\
+ats=3Don,packed=3Don \
+-object rng-random,id=3Dobjrng0,filename=3D/dev/random \
+-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,iommu_platform=3Don,ats=3Do=
n,packed=3Don,\
+bus=3Dpci.0,addr=3D0xd \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\
+resourcecontrol=3Ddeny \
+-msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/virtio-options.xml b/tests/qemuxml2argv=
data/virtio-options.xml
index 3ca27840..ba1bf7c0 100644
--- a/tests/qemuxml2argvdata/virtio-options.xml
+++ b/tests/qemuxml2argvdata/virtio-options.xml
@@ -8,6 +8,9 @@
     <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
     <boot dev=3D'hd'/>
   </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
   <clock offset=3D'utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev=3D'vda' bus=3D'virtio'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a' f=
unction=3D'0x0'/>
     </disk>
-    <controller type=3D'usb' index=3D'0'>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
     </controller>
     <controller type=3D'ide' index=3D'0'>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 66472a5e..dffca323 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2981,17 +2981,7 @@ mymain(void)
     DO_TEST_PARSE_ERROR("cpu-hotplug-granularity",
                         QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS);
=20
-    DO_TEST("virtio-options", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_KEYB=
OARD,
-            QEMU_CAPS_VIRTIO_MOUSE, QEMU_CAPS_VIRTIO_TABLET,
-            QEMU_CAPS_VIRTIO_INPUT_HOST,
-            QEMU_CAPS_DEVICE_VIRTIO_GPU,
-            QEMU_CAPS_DEVICE_VHOST_USER_GPU,
-            QEMU_CAPS_DEVICE_VIRTIO_RNG,
-            QEMU_CAPS_OBJECT_RNG_RANDOM,
-            QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
-            QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM,
-            QEMU_CAPS_VIRTIO_PCI_ATS,
-            QEMU_CAPS_VIRTIO_PACKED_QUEUES);
+    DO_TEST_CAPS_LATEST("virtio-options");
=20
     DO_TEST("fd-memory-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE,
             QEMU_CAPS_KVM);
diff --git a/tests/qemuxml2xmloutdata/virtio-options.x86_64-latest.xml b/te=
sts/qemuxml2xmloutdata/virtio-options.x86_64-latest.xml
new file mode 120000
index 00000000..26d8a252
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/virtio-options.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index cf5abeac..d6f9c43b 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1278,21 +1278,7 @@ mymain(void)
     DO_TEST("memorybacking-set", NONE);
     DO_TEST("memorybacking-unset", NONE);
=20
-    DO_TEST("virtio-options",
-            QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_VIRTIO_KEYBOARD,
-            QEMU_CAPS_VIRTIO_MOUSE,
-            QEMU_CAPS_VIRTIO_TABLET,
-            QEMU_CAPS_VIRTIO_INPUT_HOST,
-            QEMU_CAPS_DEVICE_VIRTIO_GPU,
-            QEMU_CAPS_VIRTIO_GPU_VIRGL,
-            QEMU_CAPS_DEVICE_VIRTIO_RNG,
-            QEMU_CAPS_OBJECT_RNG_RANDOM,
-            QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
-            QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM,
-            QEMU_CAPS_VIRTIO_PCI_ATS,
-            QEMU_CAPS_DEVICE_VHOST_USER_GPU,
-            QEMU_CAPS_VIRTIO_PACKED_QUEUES);
+    DO_TEST_CAPS_LATEST("virtio-options");
=20
     DO_TEST("fd-memory-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE,
             QEMU_CAPS_KVM);
--=20
2.24.1


From nobody Sun May  5 08:36:50 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 207.211.31.120 as permitted sender) client-ip=207.211.31.120;
 envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail(p=none dis=none)  header.from=linux.ibm.com
ARC-Seal: i=1; a=rsa-sha256; t=1587647740; cv=none;
	d=zohomail.com; s=zohoarc;
	b=cdw4b4AIX42tr761MirTXaRS8su/eNEh7NIXb2V4C3PtXzZgsQYUDuFW0eau0mPPsKenx4hyQzhP5cULRc9RBk6tuJoAMj+l8Tm5/RwRHsqLRA0Pp6vxTnlSWQ+C4/0LSyxZr/ArWp1QQcW1gHSiHCCh3g6HGiGDSj+qcooq0KI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1587647740;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=sG+Sr/m8pzSMZQpVGHheVm2jqs+oJ9RQ0Fli9A39hM4=;
	b=b4x6jwoxh3H/WU5EL7YthosoxyeVE/QquJl/qj5kBa1jQqmXPJVkrrotiLmp2ypSExvjcb1aCz/E1M9JU26cAXYZbwDWiZWdit6l7rnnNIoQSA/Gl8QD76b1GvQW3olc8adofbdjMR3nxdi6SVq8VyMlt+JMz3qAmxUKA8rxCxA=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail header.from=<bwalk@linux.ibm.com> (p=none dis=none)
 header.from=<bwalk@linux.ibm.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
 [207.211.31.120]) by mx.zohomail.com
	with SMTPS id 1587647740619828.7620300692655;
 Thu, 23 Apr 2020 06:15:40 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-467-cPBf4WWuORKZaB7jeNneXQ-1; Thu, 23 Apr 2020 09:15:36 -0400
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9A856100CCC1;
	Thu, 23 Apr 2020 13:15:30 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 2A8A310016DA;
	Thu, 23 Apr 2020 13:15:30 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3738B4CA94;
	Thu, 23 Apr 2020 13:15:27 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 03NDFOHi032164 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 23 Apr 2020 09:15:24 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id AA4D510CD937; Thu, 23 Apr 2020 13:15:24 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id A350710CD934
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 13:15:23 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C3B18805A72
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 13:15:22 +0000 (UTC)
Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com
	[148.163.158.5]) (Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-317-b28_gkKJMliVOHPBVV5E_A-1; Thu, 23 Apr 2020 09:15:20 -0400
Received: from pps.filterd (m0098420.ppops.net [127.0.0.1])
	by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id
	03ND0FDv083970
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 09:15:19 -0400
Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103])
	by mx0b-001b2d01.pphosted.com with ESMTP id 30kb4bs6ak-1
	(version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT)
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 09:15:18 -0400
Received: from localhost
	by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use
	Only! Violators will be prosecuted
	for <libvir-list@redhat.com> from <bwalk@linux.ibm.com>;
	Thu, 23 Apr 2020 14:15:10 +0100
Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197)
	by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway:
	Authorized Use Only! Violators will be prosecuted;
	(version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256)
	Thu, 23 Apr 2020 14:15:09 +0100
Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com
	[9.149.105.232])
	by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with
	ESMTP id 03NDFDgC56295662
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256
	verify=OK); Thu, 23 Apr 2020 13:15:13 GMT
Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1])
	by IMSVA (Postfix) with ESMTP id 1C24C52075;
	Thu, 23 Apr 2020 13:15:13 +0000 (GMT)
Received: from m46lp64.lnxne.boe (unknown [9.152.108.100])
	by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id E716D52051;
	Thu, 23 Apr 2020 13:15:12 +0000 (GMT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1587647738;
	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=sG+Sr/m8pzSMZQpVGHheVm2jqs+oJ9RQ0Fli9A39hM4=;
	b=FiamlL7UQDrunO26TquiM0LuTYqg0fxcwj9O/94+h0nAdVxWLMxRH/9JuQRqgg4m7gaS+w
	n6yGQ1k6KXJ60NHwBeUSMND360MtlTxNcsjZSiATvvwCJFIpAy7+/EjHL/5x6w0ME5+6SA
	V8wbnciIJvbCzW4PbMEqWOeNiDR0cD4=
X-MC-Unique: cPBf4WWuORKZaB7jeNneXQ-1
X-MC-Unique: b28_gkKJMliVOHPBVV5E_A-1
From: Bjoern Walk <bwalk@linux.ibm.com>
To: libvir-list@redhat.com
Subject: [PATCH 2/4] tests: more fine-granular tests for virtio-options
Date: Thu, 23 Apr 2020 15:15:07 +0200
In-Reply-To: <20200423131509.2708173-1-bwalk@linux.ibm.com>
References: <20200423131509.2708173-1-bwalk@linux.ibm.com>
MIME-Version: 1.0
X-TM-AS-GCONF: 00
x-cbid: 20042313-0028-0000-0000-000003FD995B
X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused
x-cbparentid: 20042313-0029-0000-0000-000024C36487
Message-Id: <20200423131509.2708173-3-bwalk@linux.ibm.com>
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676
	definitions=2020-04-23_10:2020-04-22,
	2020-04-23 signatures=0
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0
	mlxlogscore=999
	lowpriorityscore=0 phishscore=0 spamscore=0 clxscore=1015 mlxscore=0
	suspectscore=1 bulkscore=0 adultscore=0 malwarescore=0
	priorityscore=1501
	impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1
	engine=8.12.0-2003020000 definitions=main-2004230099
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-MIME-Autoconverted: from quoted-printable to 8bit by
	lists01.pubmisc.prod.ext.phx2.redhat.com id 03NDFOHi032164
X-loop: libvir-list@redhat.com
Cc: Bjoern Walk <bwalk@linux.ibm.com>,
	Daniel Henrique Barboza <danielhb413@gmail.com>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.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://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
Content-Type: text/plain; charset="utf-8"

Add separate tests for individual options and devices for virtio-options
to have the ability to do more fine-granular testing of various
combinations.

Also, add negative tests for unavailable capabilities.

Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Signed-off-by: Bjoern Walk <bwalk@linux.ibm.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
 .../virtio-options-controller-ats.args        | 32 ++++++
 .../virtio-options-controller-ats.xml         | 38 +++++++
 .../virtio-options-controller-iommu.args      | 34 +++++++
 .../virtio-options-controller-iommu.xml       | 38 +++++++
 .../virtio-options-controller-packed.args     | 32 ++++++
 .../virtio-options-controller-packed.xml      | 38 +++++++
 .../virtio-options-disk-ats.args              | 36 +++++++
 .../virtio-options-disk-ats.xml               | 34 +++++++
 .../virtio-options-disk-iommu.args            | 36 +++++++
 .../virtio-options-disk-iommu.xml             | 34 +++++++
 .../virtio-options-disk-packed.args           | 36 +++++++
 .../virtio-options-disk-packed.xml            | 34 +++++++
 .../virtio-options-fs-ats.args                | 34 +++++++
 .../virtio-options-fs-ats.xml                 | 34 +++++++
 .../virtio-options-fs-iommu.args              | 34 +++++++
 .../virtio-options-fs-iommu.xml               | 34 +++++++
 .../virtio-options-fs-packed.args             | 34 +++++++
 .../virtio-options-fs-packed.xml              | 34 +++++++
 .../virtio-options-input-ats.args             | 30 ++++++
 .../virtio-options-input-ats.xml              | 30 ++++++
 .../virtio-options-input-iommu.args           | 30 ++++++
 .../virtio-options-input-iommu.xml            | 30 ++++++
 .../virtio-options-input-packed.args          | 30 ++++++
 .../virtio-options-input-packed.xml           | 30 ++++++
 .../virtio-options-memballoon-ats.args        | 28 ++++++
 .../virtio-options-memballoon-ats.xml         | 23 +++++
 .../virtio-options-memballoon-iommu.args      | 28 ++++++
 .../virtio-options-memballoon-iommu.xml       | 23 +++++
 .../virtio-options-memballoon-packed.args     | 28 ++++++
 .../virtio-options-memballoon-packed.xml      | 23 +++++
 .../virtio-options-net-ats.args               | 34 +++++++
 .../virtio-options-net-ats.xml                | 34 +++++++
 .../virtio-options-net-iommu.args             | 34 +++++++
 .../virtio-options-net-iommu.xml              | 34 +++++++
 .../virtio-options-net-packed.args            | 34 +++++++
 .../virtio-options-net-packed.xml             | 34 +++++++
 .../virtio-options-rng-ats.args               | 32 ++++++
 .../virtio-options-rng-ats.xml                | 32 ++++++
 .../virtio-options-rng-iommu.args             | 34 +++++++
 .../virtio-options-rng-iommu.xml              | 32 ++++++
 .../virtio-options-rng-packed.args            | 32 ++++++
 .../virtio-options-rng-packed.xml             | 32 ++++++
 .../virtio-options-video-ats.args             | 34 +++++++
 .../virtio-options-video-ats.xml              | 36 +++++++
 .../virtio-options-video-iommu.args           | 34 +++++++
 .../virtio-options-video-iommu.xml            | 36 +++++++
 .../virtio-options-video-packed.args          | 34 +++++++
 .../virtio-options-video-packed.xml           | 36 +++++++
 tests/qemuxml2argvtest.c                      | 99 +++++++++++++++++++
 49 files changed, 1666 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-ats.ar=
gs
 create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-ats.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-iommu.=
args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-iommu.=
xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-packed=
.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-packed=
.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-ats.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-ats.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-iommu.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-iommu.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-packed.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-packed.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-ats.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-ats.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-iommu.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-iommu.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-packed.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-packed.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-input-ats.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-input-ats.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-input-iommu.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-input-iommu.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-input-packed.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-input-packed.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-ats.ar=
gs
 create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-ats.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-iommu.=
args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-iommu.=
xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-packed=
.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-packed=
.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-net-ats.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-net-ats.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-net-iommu.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-net-iommu.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-net-packed.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-net-packed.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-ats.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-ats.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-iommu.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-iommu.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-packed.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-packed.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-video-ats.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-video-ats.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-video-iommu.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-video-iommu.xml
 create mode 100644 tests/qemuxml2argvdata/virtio-options-video-packed.args
 create mode 100644 tests/qemuxml2argvdata/virtio-options-video-packed.xml

diff --git a/tests/qemuxml2argvdata/virtio-options-controller-ats.args b/te=
sts/qemuxml2argvdata/virtio-options-controller-ats.args
new file mode 100644
index 00000000..c7186ed2
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-controller-ats.args
@@ -0,0 +1,32 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-device virtio-scsi-pci,ats=3Don,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \
+-device virtio-scsi-pci,ats=3Doff,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \
+-device virtio-serial-pci,id=3Dvirtio-serial0,ats=3Don,bus=3Dpci.0,addr=3D=
0x4 \
+-device virtio-serial-pci,id=3Dvirtio-serial1,ats=3Doff,bus=3Dpci.0,addr=
=3D0x5 \
+-usb \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6
diff --git a/tests/qemuxml2argvdata/virtio-options-controller-ats.xml b/tes=
ts/qemuxml2argvdata/virtio-options-controller-ats.xml
new file mode 100644
index 00000000..b436eaf0
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-controller-ats.xml
@@ -0,0 +1,38 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <driver ats=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'1' model=3D'virtio-scsi'>
+      <driver ats=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <driver ats=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'1'>
+      <driver ats=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </controller>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-controller-iommu.args b/=
tests/qemuxml2argvdata/virtio-options-controller-iommu.args
new file mode 100644
index 00000000..6d60c5e6
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-controller-iommu.args
@@ -0,0 +1,34 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-device virtio-scsi-pci,iommu_platform=3Don,id=3Dscsi0,bus=3Dpci.0,addr=3D=
0x2 \
+-device virtio-scsi-pci,iommu_platform=3Doff,id=3Dscsi1,bus=3Dpci.0,addr=
=3D0x3 \
+-device virtio-serial-pci,id=3Dvirtio-serial0,iommu_platform=3Don,bus=3Dpc=
i.0,\
+addr=3D0x4 \
+-device virtio-serial-pci,id=3Dvirtio-serial1,iommu_platform=3Doff,bus=3Dp=
ci.0,\
+addr=3D0x5 \
+-usb \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6
diff --git a/tests/qemuxml2argvdata/virtio-options-controller-iommu.xml b/t=
ests/qemuxml2argvdata/virtio-options-controller-iommu.xml
new file mode 100644
index 00000000..86be5f0d
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-controller-iommu.xml
@@ -0,0 +1,38 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <driver iommu=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'1' model=3D'virtio-scsi'>
+      <driver iommu=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <driver iommu=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'1'>
+      <driver iommu=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </controller>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-controller-packed.args b=
/tests/qemuxml2argvdata/virtio-options-controller-packed.args
new file mode 100644
index 00000000..e853e53d
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-controller-packed.args
@@ -0,0 +1,32 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-device virtio-scsi-pci,packed=3Don,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \
+-device virtio-scsi-pci,packed=3Doff,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \
+-device virtio-serial-pci,id=3Dvirtio-serial0,packed=3Don,bus=3Dpci.0,addr=
=3D0x4 \
+-device virtio-serial-pci,id=3Dvirtio-serial1,packed=3Doff,bus=3Dpci.0,add=
r=3D0x5 \
+-usb \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6
diff --git a/tests/qemuxml2argvdata/virtio-options-controller-packed.xml b/=
tests/qemuxml2argvdata/virtio-options-controller-packed.xml
new file mode 100644
index 00000000..864fec45
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-controller-packed.xml
@@ -0,0 +1,38 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <driver packed=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'1' model=3D'virtio-scsi'>
+      <driver packed=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <driver packed=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'1'>
+      <driver packed=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </controller>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-disk-ats.args b/tests/qe=
muxml2argvdata/virtio-options-disk-ats.args
new file mode 100644
index 00000000..294ad2d4
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-disk-ats.args
@@ -0,0 +1,36 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-drive file=3D/var/lib/libvirt/images/img1,format=3Draw,if=3Dnone,\
+id=3Ddrive-virtio-disk0 \
+-device virtio-blk-pci,ats=3Don,bus=3Dpci.0,addr=3D0x2,drive=3Ddrive-virti=
o-disk0,\
+id=3Dvirtio-disk0,bootindex=3D1 \
+-drive file=3D/var/lib/libvirt/images/img2,format=3Draw,if=3Dnone,\
+id=3Ddrive-virtio-disk1 \
+-device virtio-blk-pci,ats=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virt=
io-disk1,\
+id=3Dvirtio-disk1 \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/virtio-options-disk-ats.xml b/tests/qem=
uxml2argvdata/virtio-options-disk-ats.xml
new file mode 100644
index 00000000..d0698126
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-disk-ats.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' ats=3D'on'/>
+      <source file=3D'/var/lib/libvirt/images/img1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' ats=3D'off'/>
+      <source file=3D'/var/lib/libvirt/images/img2'/>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </disk>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.args b/tests/=
qemuxml2argvdata/virtio-options-disk-iommu.args
new file mode 100644
index 00000000..185c57ca
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-disk-iommu.args
@@ -0,0 +1,36 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-drive file=3D/var/lib/libvirt/images/img1,format=3Draw,if=3Dnone,\
+id=3Ddrive-virtio-disk0 \
+-device virtio-blk-pci,iommu_platform=3Don,bus=3Dpci.0,addr=3D0x2,\
+drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,bootindex=3D1 \
+-drive file=3D/var/lib/libvirt/images/img2,format=3Draw,if=3Dnone,\
+id=3Ddrive-virtio-disk1 \
+-device virtio-blk-pci,iommu_platform=3Doff,bus=3Dpci.0,addr=3D0x3,\
+drive=3Ddrive-virtio-disk1,id=3Dvirtio-disk1 \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.xml b/tests/q=
emuxml2argvdata/virtio-options-disk-iommu.xml
new file mode 100644
index 00000000..ac09b58e
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-disk-iommu.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' iommu=3D'on'/>
+      <source file=3D'/var/lib/libvirt/images/img1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' iommu=3D'off'/>
+      <source file=3D'/var/lib/libvirt/images/img2'/>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </disk>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.args b/tests=
/qemuxml2argvdata/virtio-options-disk-packed.args
new file mode 100644
index 00000000..1fb3735d
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-disk-packed.args
@@ -0,0 +1,36 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-drive file=3D/var/lib/libvirt/images/img1,format=3Draw,if=3Dnone,\
+id=3Ddrive-virtio-disk0 \
+-device virtio-blk-pci,packed=3Don,bus=3Dpci.0,addr=3D0x2,drive=3Ddrive-vi=
rtio-disk0,\
+id=3Dvirtio-disk0,bootindex=3D1 \
+-drive file=3D/var/lib/libvirt/images/img2,format=3Draw,if=3Dnone,\
+id=3Ddrive-virtio-disk1 \
+-device virtio-blk-pci,packed=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-v=
irtio-disk1,\
+id=3Dvirtio-disk1 \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.xml b/tests/=
qemuxml2argvdata/virtio-options-disk-packed.xml
new file mode 100644
index 00000000..7edbaad6
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-disk-packed.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' packed=3D'on'/>
+      <source file=3D'/var/lib/libvirt/images/img1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' packed=3D'off'/>
+      <source file=3D'/var/lib/libvirt/images/img2'/>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </disk>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-fs-ats.args b/tests/qemu=
xml2argvdata/virtio-options-fs-ats.args
new file mode 100644
index 00000000..1ab99418
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-fs-ats.args
@@ -0,0 +1,34 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs=
1 \
+-device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Dfs1,ats=3Don,=
bus=3Dpci.0,\
+addr=3D0x2 \
+-fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs1,path=3D/export/fs=
2 \
+-device virtio-9p-pci,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3Dfs2,ats=3Doff=
,bus=3Dpci.0,\
+addr=3D0x3 \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/virtio-options-fs-ats.xml b/tests/qemux=
ml2argvdata/virtio-options-fs-ats.xml
new file mode 100644
index 00000000..5338c88a
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-fs-ats.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <driver ats=3D'on'/>
+      <source dir=3D'/export/fs1'/>
+      <target dir=3D'fs1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </filesystem>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <driver ats=3D'off'/>
+      <source dir=3D'/export/fs2'/>
+      <target dir=3D'fs2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </filesystem>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-fs-iommu.args b/tests/qe=
muxml2argvdata/virtio-options-fs-iommu.args
new file mode 100644
index 00000000..da40896b
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-fs-iommu.args
@@ -0,0 +1,34 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs=
1 \
+-device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Dfs1,iommu_pla=
tform=3Don,\
+bus=3Dpci.0,addr=3D0x2 \
+-fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs1,path=3D/export/fs=
2 \
+-device virtio-9p-pci,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3Dfs2,iommu_pla=
tform=3Doff,\
+bus=3Dpci.0,addr=3D0x3 \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/virtio-options-fs-iommu.xml b/tests/qem=
uxml2argvdata/virtio-options-fs-iommu.xml
new file mode 100644
index 00000000..31180afc
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-fs-iommu.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <driver iommu=3D'on'/>
+      <source dir=3D'/export/fs1'/>
+      <target dir=3D'fs1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </filesystem>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <driver iommu=3D'off'/>
+      <source dir=3D'/export/fs2'/>
+      <target dir=3D'fs2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </filesystem>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-fs-packed.args b/tests/q=
emuxml2argvdata/virtio-options-fs-packed.args
new file mode 100644
index 00000000..66c16f00
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-fs-packed.args
@@ -0,0 +1,34 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs=
1 \
+-device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Dfs1,packed=3D=
on,bus=3Dpci.0,\
+addr=3D0x2 \
+-fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs1,path=3D/export/fs=
2 \
+-device virtio-9p-pci,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3Dfs2,packed=3D=
off,\
+bus=3Dpci.0,addr=3D0x3 \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/virtio-options-fs-packed.xml b/tests/qe=
muxml2argvdata/virtio-options-fs-packed.xml
new file mode 100644
index 00000000..e8d6d50a
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-fs-packed.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <driver packed=3D'on'/>
+      <source dir=3D'/export/fs1'/>
+      <target dir=3D'fs1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </filesystem>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <driver packed=3D'off'/>
+      <source dir=3D'/export/fs2'/>
+      <target dir=3D'fs2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </filesystem>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-input-ats.args b/tests/q=
emuxml2argvdata/virtio-options-input-ats.args
new file mode 100644
index 00000000..9906d9b6
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-input-ats.args
@@ -0,0 +1,30 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-device virtio-mouse-pci,id=3Dinput0,bus=3Dpci.0,addr=3D0x2,ats=3Don \
+-device virtio-keyboard-pci,id=3Dinput1,bus=3Dpci.0,addr=3D0x3,ats=3Doff \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/virtio-options-input-ats.xml b/tests/qe=
muxml2argvdata/virtio-options-input-ats.xml
new file mode 100644
index 00000000..b911ff62
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-input-ats.xml
@@ -0,0 +1,30 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'virtio'>
+      <driver ats=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'keyboard' bus=3D'virtio'>
+      <driver ats=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </input>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-input-iommu.args b/tests=
/qemuxml2argvdata/virtio-options-input-iommu.args
new file mode 100644
index 00000000..69d08897
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-input-iommu.args
@@ -0,0 +1,30 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-device virtio-mouse-pci,id=3Dinput0,bus=3Dpci.0,addr=3D0x2,iommu_platform=
=3Don \
+-device virtio-keyboard-pci,id=3Dinput1,bus=3Dpci.0,addr=3D0x3,iommu_platf=
orm=3Doff \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/virtio-options-input-iommu.xml b/tests/=
qemuxml2argvdata/virtio-options-input-iommu.xml
new file mode 100644
index 00000000..31fd74be
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-input-iommu.xml
@@ -0,0 +1,30 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'virtio'>
+      <driver iommu=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'keyboard' bus=3D'virtio'>
+      <driver iommu=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </input>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-input-packed.args b/test=
s/qemuxml2argvdata/virtio-options-input-packed.args
new file mode 100644
index 00000000..f89450cf
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-input-packed.args
@@ -0,0 +1,30 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-device virtio-mouse-pci,id=3Dinput0,bus=3Dpci.0,addr=3D0x2,packed=3Don \
+-device virtio-keyboard-pci,id=3Dinput1,bus=3Dpci.0,addr=3D0x3,packed=3Dof=
f \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/virtio-options-input-packed.xml b/tests=
/qemuxml2argvdata/virtio-options-input-packed.xml
new file mode 100644
index 00000000..1378b42d
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-input-packed.xml
@@ -0,0 +1,30 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'virtio'>
+      <driver packed=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'keyboard' bus=3D'virtio'>
+      <driver packed=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </input>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.args b/te=
sts/qemuxml2argvdata/virtio-options-memballoon-ats.args
new file mode 100644
index 00000000..bb507b74
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.args
@@ -0,0 +1,28 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2,ats=3Don
diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.xml b/tes=
ts/qemuxml2argvdata/virtio-options-memballoon-ats.xml
new file mode 100644
index 00000000..f1ac052c
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.xml
@@ -0,0 +1,23 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+      <driver ats=3D'on'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.args b/=
tests/qemuxml2argvdata/virtio-options-memballoon-iommu.args
new file mode 100644
index 00000000..9c1d15b8
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.args
@@ -0,0 +1,28 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2,iommu_plat=
form=3Don
diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.xml b/t=
ests/qemuxml2argvdata/virtio-options-memballoon-iommu.xml
new file mode 100644
index 00000000..eba704e1
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.xml
@@ -0,0 +1,23 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+      <driver iommu=3D'on'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.args b=
/tests/qemuxml2argvdata/virtio-options-memballoon-packed.args
new file mode 100644
index 00000000..6bda122f
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.args
@@ -0,0 +1,28 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2,packed=3Don
diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.xml b/=
tests/qemuxml2argvdata/virtio-options-memballoon-packed.xml
new file mode 100644
index 00000000..5597ef93
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.xml
@@ -0,0 +1,23 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+      <driver packed=3D'on'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-net-ats.args b/tests/qem=
uxml2argvdata/virtio-options-net-ats.args
new file mode 100644
index 00000000..020f1acd
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-net-ats.args
@@ -0,0 +1,34 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-netdev user,id=3Dhostnet0 \
+-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:56:58:5a:5c=
,bus=3Dpci.0,\
+addr=3D0x2,ats=3Don \
+-netdev user,id=3Dhostnet1 \
+-device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D62:64:66:68:6a:6c=
,bus=3Dpci.0,\
+addr=3D0x3,ats=3Doff \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/virtio-options-net-ats.xml b/tests/qemu=
xml2argvdata/virtio-options-net-ats.xml
new file mode 100644
index 00000000..b1e3ff28
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-net-ats.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:56:58:5a:5c'/>
+      <model type=3D'virtio'/>
+      <driver ats=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'62:64:66:68:6a:6c'/>
+      <model type=3D'virtio'/>
+      <driver ats=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-net-iommu.args b/tests/q=
emuxml2argvdata/virtio-options-net-iommu.args
new file mode 100644
index 00000000..7d775c69
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-net-iommu.args
@@ -0,0 +1,34 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-netdev user,id=3Dhostnet0 \
+-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:56:58:5a:5c=
,bus=3Dpci.0,\
+addr=3D0x2,iommu_platform=3Don \
+-netdev user,id=3Dhostnet1 \
+-device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D62:64:66:68:6a:6c=
,bus=3Dpci.0,\
+addr=3D0x3,iommu_platform=3Doff \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/virtio-options-net-iommu.xml b/tests/qe=
muxml2argvdata/virtio-options-net-iommu.xml
new file mode 100644
index 00000000..689eaa8f
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-net-iommu.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:56:58:5a:5c'/>
+      <model type=3D'virtio'/>
+      <driver iommu=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'62:64:66:68:6a:6c'/>
+      <model type=3D'virtio'/>
+      <driver iommu=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-net-packed.args b/tests/=
qemuxml2argvdata/virtio-options-net-packed.args
new file mode 100644
index 00000000..3122ff56
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-net-packed.args
@@ -0,0 +1,34 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-netdev user,id=3Dhostnet0 \
+-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:56:58:5a:5c=
,bus=3Dpci.0,\
+addr=3D0x2,packed=3Don \
+-netdev user,id=3Dhostnet1 \
+-device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D62:64:66:68:6a:6c=
,bus=3Dpci.0,\
+addr=3D0x3,packed=3Doff \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/virtio-options-net-packed.xml b/tests/q=
emuxml2argvdata/virtio-options-net-packed.xml
new file mode 100644
index 00000000..85e39761
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-net-packed.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:56:58:5a:5c'/>
+      <model type=3D'virtio'/>
+      <driver packed=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'62:64:66:68:6a:6c'/>
+      <model type=3D'virtio'/>
+      <driver packed=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-rng-ats.args b/tests/qem=
uxml2argvdata/virtio-options-rng-ats.args
new file mode 100644
index 00000000..2ce3be00
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-rng-ats.args
@@ -0,0 +1,32 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \
+-object rng-random,id=3Dobjrng0,filename=3D/dev/random \
+-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,ats=3Don,bus=3Dpci.0,addr=
=3D0x2 \
+-object rng-random,id=3Dobjrng1,filename=3D/dev/random \
+-device virtio-rng-pci,rng=3Dobjrng1,id=3Drng1,ats=3Doff,bus=3Dpci.0,addr=
=3D0x3
diff --git a/tests/qemuxml2argvdata/virtio-options-rng-ats.xml b/tests/qemu=
xml2argvdata/virtio-options-rng-ats.xml
new file mode 100644
index 00000000..d4b0f5f1
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-rng-ats.xml
@@ -0,0 +1,32 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <driver ats=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </rng>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <driver ats=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </rng>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-rng-iommu.args b/tests/q=
emuxml2argvdata/virtio-options-rng-iommu.args
new file mode 100644
index 00000000..781d4293
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-rng-iommu.args
@@ -0,0 +1,34 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \
+-object rng-random,id=3Dobjrng0,filename=3D/dev/random \
+-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,iommu_platform=3Don,bus=3Dp=
ci.0,\
+addr=3D0x2 \
+-object rng-random,id=3Dobjrng1,filename=3D/dev/random \
+-device virtio-rng-pci,rng=3Dobjrng1,id=3Drng1,iommu_platform=3Doff,bus=3D=
pci.0,\
+addr=3D0x3
diff --git a/tests/qemuxml2argvdata/virtio-options-rng-iommu.xml b/tests/qe=
muxml2argvdata/virtio-options-rng-iommu.xml
new file mode 100644
index 00000000..43bead71
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-rng-iommu.xml
@@ -0,0 +1,32 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <driver iommu=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </rng>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <driver iommu=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </rng>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-rng-packed.args b/tests/=
qemuxml2argvdata/virtio-options-rng-packed.args
new file mode 100644
index 00000000..c415314f
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-rng-packed.args
@@ -0,0 +1,32 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \
+-object rng-random,id=3Dobjrng0,filename=3D/dev/random \
+-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,packed=3Don,bus=3Dpci.0,add=
r=3D0x2 \
+-object rng-random,id=3Dobjrng1,filename=3D/dev/random \
+-device virtio-rng-pci,rng=3Dobjrng1,id=3Drng1,packed=3Doff,bus=3Dpci.0,ad=
dr=3D0x3
diff --git a/tests/qemuxml2argvdata/virtio-options-rng-packed.xml b/tests/q=
emuxml2argvdata/virtio-options-rng-packed.xml
new file mode 100644
index 00000000..22f7e413
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-rng-packed.xml
@@ -0,0 +1,32 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <driver packed=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </rng>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <driver packed=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </rng>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-video-ats.args b/tests/q=
emuxml2argvdata/virtio-options-video-ats.args
new file mode 100644
index 00000000..2d1a7086
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-video-ats.args
@@ -0,0 +1,34 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-chardev socket,id=3Dchr-vu-video0,fd=3D1729 \
+-chardev socket,id=3Dchr-vu-video1,fd=3D1729 \
+-device vhost-user-gpu-pci,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-vi=
deo0,\
+bus=3Dpci.0,addr=3D0x2,ats=3Don \
+-device vhost-user-gpu-pci,id=3Dvideo1,max_outputs=3D1,chardev=3Dchr-vu-vi=
deo1,\
+bus=3Dpci.0,addr=3D0x3,ats=3Doff \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/virtio-options-video-ats.xml b/tests/qe=
muxml2argvdata/virtio-options-video-ats.xml
new file mode 100644
index 00000000..c39523d9
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-video-ats.xml
@@ -0,0 +1,36 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <video>
+      <driver ats=3D'on' name=3D'vhostuser'/>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'>
+        <acceleration accel3d=3D'yes' rendernode=3D'/dev/dri/test'/>
+      </model>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <video>
+      <driver ats=3D'off' name=3D'vhostuser'/>
+      <model type=3D'virtio' heads=3D'1' primary=3D'no'>
+        <acceleration accel3d=3D'yes' rendernode=3D'/dev/dri/test'/>
+      </model>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-video-iommu.args b/tests=
/qemuxml2argvdata/virtio-options-video-iommu.args
new file mode 100644
index 00000000..1ab891c5
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-video-iommu.args
@@ -0,0 +1,34 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-chardev socket,id=3Dchr-vu-video0,fd=3D1729 \
+-chardev socket,id=3Dchr-vu-video1,fd=3D1729 \
+-device vhost-user-gpu-pci,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-vi=
deo0,\
+bus=3Dpci.0,addr=3D0x2,iommu_platform=3Don \
+-device vhost-user-gpu-pci,id=3Dvideo1,max_outputs=3D1,chardev=3Dchr-vu-vi=
deo1,\
+bus=3Dpci.0,addr=3D0x3,iommu_platform=3Doff \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/virtio-options-video-iommu.xml b/tests/=
qemuxml2argvdata/virtio-options-video-iommu.xml
new file mode 100644
index 00000000..13d921e2
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-video-iommu.xml
@@ -0,0 +1,36 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <video>
+      <driver iommu=3D'on' name=3D'vhostuser'/>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'>
+        <acceleration accel3d=3D'yes' rendernode=3D'/dev/dri/test'/>
+      </model>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <video>
+      <driver iommu=3D'off' name=3D'vhostuser'/>
+      <model type=3D'virtio' heads=3D'1' primary=3D'no'>
+        <acceleration accel3d=3D'yes' rendernode=3D'/dev/dri/test'/>
+      </model>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/virtio-options-video-packed.args b/test=
s/qemuxml2argvdata/virtio-options-video-packed.args
new file mode 100644
index 00000000..93551d0b
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-video-packed.args
@@ -0,0 +1,34 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-QEMUGuest1 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-chardev socket,id=3Dchr-vu-video0,fd=3D1729 \
+-chardev socket,id=3Dchr-vu-video1,fd=3D1729 \
+-device vhost-user-gpu-pci,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-vi=
deo0,\
+bus=3Dpci.0,addr=3D0x2,packed=3Don \
+-device vhost-user-gpu-pci,id=3Dvideo1,max_outputs=3D1,chardev=3Dchr-vu-vi=
deo1,\
+bus=3Dpci.0,addr=3D0x3,packed=3Doff \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/virtio-options-video-packed.xml b/tests=
/qemuxml2argvdata/virtio-options-video-packed.xml
new file mode 100644
index 00000000..4ef06b77
--- /dev/null
+++ b/tests/qemuxml2argvdata/virtio-options-video-packed.xml
@@ -0,0 +1,36 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'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>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <video>
+      <driver packed=3D'on' name=3D'vhostuser'/>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'>
+        <acceleration accel3d=3D'yes' rendernode=3D'/dev/dri/test'/>
+      </model>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <video>
+      <driver packed=3D'off' name=3D'vhostuser'/>
+      <model type=3D'virtio' heads=3D'1' primary=3D'no'>
+        <acceleration accel3d=3D'yes' rendernode=3D'/dev/dri/test'/>
+      </model>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index dffca323..7ceb3aee 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2982,6 +2982,105 @@ mymain(void)
                         QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS);
=20
     DO_TEST_CAPS_LATEST("virtio-options");
+    DO_TEST("virtio-options-controller-iommu", QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM);
+    DO_TEST("virtio-options-disk-iommu", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFO=
RM);
+    DO_TEST("virtio-options-fs-iommu", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM=
);
+    DO_TEST("virtio-options-input-iommu", QEMU_CAPS_VIRTIO_MOUSE,
+            QEMU_CAPS_VIRTIO_KEYBOARD,
+            QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM);
+    DO_TEST("virtio-options-memballoon-iommu",
+            QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM);
+    DO_TEST("virtio-options-net-iommu", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFOR=
M);
+    DO_TEST("virtio-options-rng-iommu", QEMU_CAPS_DEVICE_VIRTIO_RNG,
+            QEMU_CAPS_OBJECT_RNG_RANDOM,
+            QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM);
+    DO_TEST("virtio-options-video-iommu", QEMU_CAPS_DEVICE_VIRTIO_GPU,
+            QEMU_CAPS_DEVICE_VIRTIO_GPU,
+            QEMU_CAPS_VIRTIO_GPU_VIRGL,
+            QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
+            QEMU_CAPS_DEVICE_VHOST_USER_GPU,
+            QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM);
+    DO_TEST("virtio-options-controller-ats", QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_VIRTIO_PCI_ATS);
+    DO_TEST("virtio-options-disk-ats", QEMU_CAPS_VIRTIO_PCI_ATS);
+    DO_TEST("virtio-options-fs-ats", QEMU_CAPS_VIRTIO_PCI_ATS);
+    DO_TEST("virtio-options-input-ats", QEMU_CAPS_VIRTIO_MOUSE,
+            QEMU_CAPS_VIRTIO_KEYBOARD,
+            QEMU_CAPS_VIRTIO_PCI_ATS);
+    DO_TEST("virtio-options-memballoon-ats",
+            QEMU_CAPS_VIRTIO_PCI_ATS);
+    DO_TEST("virtio-options-net-ats", QEMU_CAPS_VIRTIO_PCI_ATS);
+    DO_TEST("virtio-options-rng-ats", QEMU_CAPS_DEVICE_VIRTIO_RNG,
+            QEMU_CAPS_OBJECT_RNG_RANDOM,
+            QEMU_CAPS_VIRTIO_PCI_ATS);
+    DO_TEST("virtio-options-video-ats", QEMU_CAPS_DEVICE_VIRTIO_GPU,
+            QEMU_CAPS_DEVICE_VIRTIO_GPU,
+            QEMU_CAPS_VIRTIO_GPU_VIRGL,
+            QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
+            QEMU_CAPS_DEVICE_VHOST_USER_GPU,
+            QEMU_CAPS_VIRTIO_PCI_ATS);
+    DO_TEST("virtio-options-controller-packed", QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_VIRTIO_PACKED_QUEUES);
+    DO_TEST("virtio-options-disk-packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES);
+    DO_TEST("virtio-options-fs-packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES);
+    DO_TEST("virtio-options-input-packed", QEMU_CAPS_VIRTIO_MOUSE,
+            QEMU_CAPS_VIRTIO_KEYBOARD,
+            QEMU_CAPS_VIRTIO_PACKED_QUEUES);
+    DO_TEST("virtio-options-memballoon-packed",
+            QEMU_CAPS_VIRTIO_PACKED_QUEUES);
+    DO_TEST("virtio-options-net-packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES);
+    DO_TEST("virtio-options-rng-packed", QEMU_CAPS_DEVICE_VIRTIO_RNG,
+            QEMU_CAPS_OBJECT_RNG_RANDOM,
+            QEMU_CAPS_VIRTIO_PACKED_QUEUES);
+    DO_TEST("virtio-options-video-packed", QEMU_CAPS_DEVICE_VIRTIO_GPU,
+            QEMU_CAPS_DEVICE_VIRTIO_GPU,
+            QEMU_CAPS_VIRTIO_GPU_VIRGL,
+            QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
+            QEMU_CAPS_DEVICE_VHOST_USER_GPU,
+            QEMU_CAPS_VIRTIO_PACKED_QUEUES);
+    DO_TEST_FAILURE("virtio-options-controller-iommu", QEMU_CAPS_VIRTIO_SC=
SI);
+    DO_TEST_FAILURE("virtio-options-disk-iommu", NONE);
+    DO_TEST_FAILURE("virtio-options-fs-iommu", NONE);
+    DO_TEST_FAILURE("virtio-options-input-iommu", QEMU_CAPS_VIRTIO_MOUSE,
+                    QEMU_CAPS_VIRTIO_KEYBOARD);
+    DO_TEST_FAILURE("virtio-options-memballoon-iommu", NONE);
+    DO_TEST_FAILURE("virtio-options-net-iommu", NONE);
+    DO_TEST_FAILURE("virtio-options-rng-iommu", QEMU_CAPS_DEVICE_VIRTIO_RN=
G,
+                    QEMU_CAPS_OBJECT_RNG_RANDOM);
+    DO_TEST_FAILURE("virtio-options-video-iommu", QEMU_CAPS_DEVICE_VIRTIO_=
GPU,
+                    QEMU_CAPS_DEVICE_VIRTIO_GPU,
+                    QEMU_CAPS_VIRTIO_GPU_VIRGL,
+                    QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
+                    QEMU_CAPS_DEVICE_VHOST_USER_GPU);
+    DO_TEST_FAILURE("virtio-options-controller-ats", QEMU_CAPS_VIRTIO_SCSI=
);
+    DO_TEST_FAILURE("virtio-options-disk-ats", NONE);
+    DO_TEST_FAILURE("virtio-options-fs-ats", NONE);
+    DO_TEST_FAILURE("virtio-options-input-ats", QEMU_CAPS_VIRTIO_MOUSE,
+                    QEMU_CAPS_VIRTIO_KEYBOARD);
+    DO_TEST_FAILURE("virtio-options-memballoon-ats", NONE);
+    DO_TEST_FAILURE("virtio-options-net-ats", NONE);
+    DO_TEST_FAILURE("virtio-options-rng-ats", QEMU_CAPS_DEVICE_VIRTIO_RNG,
+                    QEMU_CAPS_OBJECT_RNG_RANDOM);
+    DO_TEST_FAILURE("virtio-options-video-ats", QEMU_CAPS_DEVICE_VIRTIO_GP=
U,
+                    QEMU_CAPS_DEVICE_VIRTIO_GPU,
+                    QEMU_CAPS_VIRTIO_GPU_VIRGL,
+                    QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
+                    QEMU_CAPS_DEVICE_VHOST_USER_GPU);
+    DO_TEST_FAILURE("virtio-options-controller-packed", QEMU_CAPS_VIRTIO_S=
CSI);
+    DO_TEST_FAILURE("virtio-options-disk-packed", NONE);
+    DO_TEST_FAILURE("virtio-options-fs-packed", NONE);
+    DO_TEST_FAILURE("virtio-options-input-packed", QEMU_CAPS_VIRTIO_MOUSE,
+                    QEMU_CAPS_VIRTIO_KEYBOARD);
+    DO_TEST_FAILURE("virtio-options-memballoon-packed", NONE);
+    DO_TEST_FAILURE("virtio-options-net-packed", NONE);
+    DO_TEST_FAILURE("virtio-options-rng-packed", QEMU_CAPS_DEVICE_VIRTIO_R=
NG,
+                    QEMU_CAPS_OBJECT_RNG_RANDOM);
+    DO_TEST_FAILURE("virtio-options-video-packed", QEMU_CAPS_DEVICE_VIRTIO=
_GPU,
+                    QEMU_CAPS_DEVICE_VIRTIO_GPU,
+                    QEMU_CAPS_VIRTIO_GPU_VIRGL,
+                    QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
+                    QEMU_CAPS_DEVICE_VHOST_USER_GPU);
=20
     DO_TEST("fd-memory-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE,
             QEMU_CAPS_KVM);
--=20
2.24.1


From nobody Sun May  5 08:36:50 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 207.211.31.81 as permitted sender) client-ip=207.211.31.81;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail(p=none dis=none)  header.from=linux.ibm.com
ARC-Seal: i=1; a=rsa-sha256; t=1587647766; cv=none;
	d=zohomail.com; s=zohoarc;
	b=Ks5SI7qaSHvQDjyyFp1doJljrhVda+Em0nacXqiV+8MFEvmr620o1Y0gGeIcETDmzuHmTUla1zRcvymxyHHryKW7nmCy+/YzsO2HQAe3xkgEqrfGCuVV6y18OYi4BLY4NLuK5+WhGhAfdAvLYNRO1kYq0HZIV/TXFPd24LCZICs=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1587647766;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=Jo0cYLsSUZr+IgXHYYH6tmnvDx/sAzf4aqqdHBm+JfM=;
	b=Rfm+CaqwwUKcTbOJ+gezlN/onSk7tvmk6q+j0dhBDkUYDXc/tPEG7nxcVsePpPQ69YwwhEqBNIBrNIiTBVrcXnWeFevfGTIqS/4UqkT9TWpme3Ow5jqbAzkVRIoCXF6lQIw7lU9+X6jM0Gt3abctPd8PsNmtxMXc3uoMRbS/EmU=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail header.from=<bwalk@linux.ibm.com> (p=none dis=none)
 header.from=<bwalk@linux.ibm.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com
 [207.211.31.81]) by mx.zohomail.com
	with SMTPS id 15876477666571.4938617297161727;
 Thu, 23 Apr 2020 06:16:06 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-453-CsaGrBqsPOOIEul9M90Iow-1; Thu, 23 Apr 2020 09:16:00 -0400
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
 [10.5.11.14])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5A6C3107ACF7;
	Thu, 23 Apr 2020 13:15:54 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 31BDC5D9D3;
	Thu, 23 Apr 2020 13:15:54 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id E157D4CAA8;
	Thu, 23 Apr 2020 13:15:53 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
	[10.11.54.4])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 03NDFQXV032186 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 23 Apr 2020 09:15:26 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 0703F202696C; Thu, 23 Apr 2020 13:15:26 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 02BA92026E04
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 13:15:25 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
	[205.139.110.120])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C243B800C6D
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 13:15:25 +0000 (UTC)
Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com
	[148.163.156.1]) (Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-222-dhXPneYjPr2Hs-y5JY-fvw-1; Thu, 23 Apr 2020 09:15:21 -0400
Received: from pps.filterd (m0098394.ppops.net [127.0.0.1])
	by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id
	03ND2f7Q047151
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 09:15:20 -0400
Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101])
	by mx0a-001b2d01.pphosted.com with ESMTP id 30k7rbyyrb-1
	(version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT)
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 09:15:20 -0400
Received: from localhost
	by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use
	Only! Violators will be prosecuted
	for <libvir-list@redhat.com> from <bwalk@linux.ibm.com>;
	Thu, 23 Apr 2020 14:14:22 +0100
Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197)
	by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway:
	Authorized Use Only! Violators will be prosecuted;
	(version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256)
	Thu, 23 Apr 2020 14:14:19 +0100
Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com
	[9.149.105.232])
	by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with
	ESMTP id 03NDFD9c56295664
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256
	verify=OK); Thu, 23 Apr 2020 13:15:13 GMT
Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1])
	by IMSVA (Postfix) with ESMTP id 44F4C5205A;
	Thu, 23 Apr 2020 13:15:13 +0000 (GMT)
Received: from m46lp64.lnxne.boe (unknown [9.152.108.100])
	by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 2758152050;
	Thu, 23 Apr 2020 13:15:13 +0000 (GMT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1587647765;
	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=Jo0cYLsSUZr+IgXHYYH6tmnvDx/sAzf4aqqdHBm+JfM=;
	b=EhUejbh0xkqgEZsBfKTLl+PEHjxZvPAFoBx1PNFf25xEtwFGFRQ4yGHAmBWVQFpZB6nzzw
	NfpPgkeCcY3JLlNcqx/yzUXLnx+sThZDg9AZyMjDeJnJFdZfTyjgjmaPbC+fcK9mVw/hnp
	ZR4OJGhFPiue4d6g1Qg25+q+B0dIuLI=
X-MC-Unique: CsaGrBqsPOOIEul9M90Iow-1
X-MC-Unique: dhXPneYjPr2Hs-y5JY-fvw-1
From: Bjoern Walk <bwalk@linux.ibm.com>
To: libvir-list@redhat.com
Subject: [PATCH 3/4] qemu: move virtio capability validation
Date: Thu, 23 Apr 2020 15:15:08 +0200
In-Reply-To: <20200423131509.2708173-1-bwalk@linux.ibm.com>
References: <20200423131509.2708173-1-bwalk@linux.ibm.com>
MIME-Version: 1.0
X-TM-AS-GCONF: 00
x-cbid: 20042313-0020-0000-0000-000003CD2E39
X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused
x-cbparentid: 20042313-0021-0000-0000-000022262F20
Message-Id: <20200423131509.2708173-4-bwalk@linux.ibm.com>
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676
	definitions=2020-04-23_09:2020-04-22,
	2020-04-23 signatures=0
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0
	malwarescore=0 spamscore=0
	clxscore=1015 priorityscore=1501 mlxlogscore=999 impostorscore=0
	mlxscore=0 phishscore=0 lowpriorityscore=0 adultscore=0 suspectscore=1
	bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
	engine=8.12.0-2003020000 definitions=main-2004230099
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4
X-MIME-Autoconverted: from quoted-printable to 8bit by
	lists01.pubmisc.prod.ext.phx2.redhat.com id 03NDFQXV032186
X-loop: libvir-list@redhat.com
Cc: Bjoern Walk <bwalk@linux.ibm.com>,
	Daniel Henrique Barboza <danielhb413@gmail.com>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.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://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
Content-Type: text/plain; charset="utf-8"

Move capability validation of virtio options from command line
generation to post-parse device validation where it belongs.

Signed-off-by: Bjoern Walk <bwalk@linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/qemu/qemu_command.c  | 41 ++++++--------------
 src/qemu/qemu_validate.c | 70 +++++++++++++++++++++++++++++++--
 tests/qemuxml2argvtest.c | 84 ++++++++++++++++++++--------------------
 3 files changed, 120 insertions(+), 75 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 95402fc4..ca9d3f10 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -588,39 +588,20 @@ qemuBuildVirtioDevStr(virBufferPtr buf,
=20
 static int
 qemuBuildVirtioOptionsStr(virBufferPtr buf,
-                          virDomainVirtioOptionsPtr virtio,
-                          virQEMUCapsPtr qemuCaps)
+                          virDomainVirtioOptionsPtr virtio)
 {
     if (!virtio)
         return 0;
=20
     if (virtio->iommu !=3D VIR_TRISTATE_SWITCH_ABSENT) {
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM)=
) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("the iommu setting is not supported "
-                             "with this QEMU binary"));
-            return -1;
-        }
         virBufferAsprintf(buf, ",iommu_platform=3D%s",
                           virTristateSwitchTypeToString(virtio->iommu));
     }
     if (virtio->ats !=3D VIR_TRISTATE_SWITCH_ABSENT) {
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_ATS)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("the ats setting is not supported with this "
-                             "QEMU binary"));
-            return -1;
-        }
         virBufferAsprintf(buf, ",ats=3D%s",
                           virTristateSwitchTypeToString(virtio->ats));
     }
     if (virtio->packed !=3D VIR_TRISTATE_SWITCH_ABSENT) {
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PACKED_QUEUES)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("the packed setting is not supported with thi=
s "
-                             "QEMU binary"));
-            return -1;
-        }
         virBufferAsprintf(buf, ",packed=3D%s",
                           virTristateSwitchTypeToString(virtio->packed));
     }
@@ -2150,7 +2131,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def,
             virBufferAsprintf(&opt, ",num-queues=3D%u", disk->queues);
         }
=20
-        if (qemuBuildVirtioOptionsStr(&opt, disk->virtio, qemuCaps) < 0)
+        if (qemuBuildVirtioOptionsStr(&opt, disk->virtio) < 0)
             return NULL;
=20
         if (qemuBuildDeviceAddressStr(&opt, def, &disk->info, qemuCaps) < =
0)
@@ -2615,7 +2596,7 @@ qemuBuildVHostUserFsCommandLine(virCommandPtr cmd,
         virBufferAsprintf(&opt, ",queue-size=3D%llu", fs->queue_size);
     virBufferAddLit(&opt, ",tag=3D");
     virQEMUBuildBufferEscapeComma(&opt, fs->dst);
-    if (qemuBuildVirtioOptionsStr(&opt, fs->virtio, priv->qemuCaps) < 0)
+    if (qemuBuildVirtioOptionsStr(&opt, fs->virtio) < 0)
         return -1;
=20
     if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, priv->qemuCaps) < =
0)
@@ -2685,7 +2666,7 @@ qemuBuildFSDevStr(const virDomainDef *def,
     virBufferAddLit(&opt, ",mount_tag=3D");
     virQEMUBuildBufferEscapeComma(&opt, fs->dst);
=20
-    if (qemuBuildVirtioOptionsStr(&opt, fs->virtio, qemuCaps) < 0)
+    if (qemuBuildVirtioOptionsStr(&opt, fs->virtio) < 0)
         return NULL;
=20
     if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, qemuCaps) < 0)
@@ -2917,7 +2898,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD=
ef,
                                   def->iothread);
             }
=20
-            if (qemuBuildVirtioOptionsStr(&buf, def->virtio, qemuCaps) < 0)
+            if (qemuBuildVirtioOptionsStr(&buf, def->virtio) < 0)
                 return -1;
             break;
         case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC:
@@ -2964,7 +2945,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD=
ef,
             virBufferAsprintf(&buf, ",vectors=3D%d",
                               def->opts.vioserial.vectors);
         }
-        if (qemuBuildVirtioOptionsStr(&buf, def->virtio, qemuCaps) < 0)
+        if (qemuBuildVirtioOptionsStr(&buf, def->virtio) < 0)
             return -1;
         break;
=20
@@ -3916,7 +3897,7 @@ qemuBuildNicDevStr(virDomainDefPtr def,
     if (bootindex)
         virBufferAsprintf(&buf, ",bootindex=3D%u", bootindex);
     if (usingVirtio &&
-        qemuBuildVirtioOptionsStr(&buf, net->virtio, qemuCaps) < 0)
+        qemuBuildVirtioOptionsStr(&buf, net->virtio) < 0)
         return NULL;
=20
     return virBufferContentAndReset(&buf);
@@ -4158,7 +4139,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd,
                           virTristateSwitchTypeToString(def->memballoon->a=
utodeflate));
     }
=20
-    if (qemuBuildVirtioOptionsStr(&buf, def->memballoon->virtio, qemuCaps)=
 < 0)
+    if (qemuBuildVirtioOptionsStr(&buf, def->memballoon->virtio) < 0)
         return -1;
=20
     if (qemuCommandAddExtDevice(cmd, &def->memballoon->info) < 0)
@@ -4250,7 +4231,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def,
     if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
         return NULL;
=20
-    if (qemuBuildVirtioOptionsStr(&buf, dev->virtio, qemuCaps) < 0)
+    if (qemuBuildVirtioOptionsStr(&buf, dev->virtio) < 0)
         return NULL;
=20
     return virBufferContentAndReset(&buf);
@@ -4561,7 +4542,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
     if (qemuBuildDeviceAddressStr(&buf, def, &video->info, qemuCaps) < 0)
         return NULL;
=20
-    if (qemuBuildVirtioOptionsStr(&buf, video->virtio, qemuCaps) < 0)
+    if (qemuBuildVirtioOptionsStr(&buf, video->virtio) < 0)
         return NULL;
=20
     return virBufferContentAndReset(&buf);
@@ -5777,7 +5758,7 @@ qemuBuildRNGDevStr(const virDomainDef *def,
             virBufferAddLit(&buf, ",period=3D1000");
     }
=20
-    if (qemuBuildVirtioOptionsStr(&buf, dev->virtio, qemuCaps) < 0)
+    if (qemuBuildVirtioOptionsStr(&buf, dev->virtio) < 0)
         return NULL;
=20
     if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index cb0ff8d6..76691a5b 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -1045,6 +1045,40 @@ qemuValidateNetSupportsCoalesce(virDomainNetType typ=
e)
 }
=20
=20
+static int
+qemuValidateDomainVirtioOptions(const virDomainVirtioOptions *virtio,
+                                virQEMUCapsPtr qemuCaps)
+{
+    if (!virtio)
+        return 0;
+
+    if (virtio->iommu !=3D VIR_TRISTATE_SWITCH_ABSENT &&
+        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM)) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("the iommu setting is not supported "
+                         "with this QEMU binary"));
+        return -1;
+    }
+
+    if (virtio->ats !=3D VIR_TRISTATE_SWITCH_ABSENT &&
+        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_ATS)) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("the ats setting is not supported with this "
+                         "QEMU binary"));
+        return -1;
+    }
+
+    if (virtio->packed !=3D VIR_TRISTATE_SWITCH_ABSENT &&
+        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PACKED_QUEUES)) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("the packed setting is not supported with thi=
s "
+                             "QEMU binary"));
+            return -1;
+        }
+    return 0;
+}
+
+
 static int
 qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
                                    virQEMUCapsPtr qemuCaps)
@@ -1122,6 +1156,8 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNet=
Def *net,
                            _("tx_queue_size has to be a power of two"));
             return -1;
         }
+        if (qemuValidateDomainVirtioOptions(net->virtio, qemuCaps) < 0)
+            return -1;
     }
=20
     if (net->mtu &&
@@ -1469,12 +1505,15 @@ qemuValidateDomainSmartcardDef(const virDomainSmart=
cardDef *def,
=20
 static int
 qemuValidateDomainRNGDef(const virDomainRNGDef *def,
-                         virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
+                         virQEMUCapsPtr qemuCaps)
 {
     if (def->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_EGD &&
         qemuValidateDomainChrSourceDef(def->source.chardev, qemuCaps) < 0)
         return -1;
=20
+    if (qemuValidateDomainVirtioOptions(def->virtio, qemuCaps) < 0)
+        return -1;
+
     return 0;
 }
=20
@@ -1818,6 +1857,9 @@ qemuValidateDomainDeviceDefVideo(const virDomainVideo=
Def *video,
         }
     }
=20
+    if (qemuValidateDomainVirtioOptions(video->virtio, qemuCaps) < 0)
+        return -1;
+
     return 0;
 }
=20
@@ -1916,6 +1958,11 @@ qemuValidateDomainDeviceDefDisk(const virDomainDiskD=
ef *disk,
             return -1;
     }
=20
+    if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_VIRTIO &&
+        qemuValidateDomainVirtioOptions(disk->virtio, qemuCaps) < 0) {
+        return -1;
+    }
+
     return 0;
 }
=20
@@ -2146,7 +2193,8 @@ virValidateControllerPCIModelNameToQEMUCaps(int model=
Name)
=20
=20
 static int
-qemuValidateDomainDeviceDefControllerAttributes(const virDomainControllerD=
ef *controller)
+qemuValidateDomainDeviceDefControllerAttributes(const virDomainControllerD=
ef *controller,
+                                                virQEMUCapsPtr qemuCaps)
 {
     if (!(controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI &&
           (controller->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTI=
O_SCSI ||
@@ -2177,6 +2225,13 @@ qemuValidateDomainDeviceDefControllerAttributes(cons=
t virDomainControllerDef *co
                            _("'iothread' is only supported for virtio-scsi=
 controller"));
             return -1;
         }
+        if (qemuValidateDomainVirtioOptions(controller->virtio, qemuCaps) =
< 0)
+            return -1;
+    }
+
+    if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL &&
+        qemuValidateDomainVirtioOptions(controller->virtio, qemuCaps) < 0)=
 {
+        return -1;
     }
=20
     return 0;
@@ -2719,7 +2774,7 @@ qemuValidateDomainDeviceDefController(const virDomain=
ControllerDef *controller,
         !qemuValidateCheckSCSIControllerModel(qemuCaps, controller->model))
         return -1;
=20
-    if (qemuValidateDomainDeviceDefControllerAttributes(controller) < 0)
+    if (qemuValidateDomainDeviceDefControllerAttributes(controller, qemuCa=
ps) < 0)
         return -1;
=20
     switch ((virDomainControllerType)controller->type) {
@@ -3056,6 +3111,9 @@ qemuValidateDomainDeviceDefFS(virDomainFSDefPtr fs,
         return -1;
     }
=20
+    if (qemuValidateDomainVirtioOptions(fs->virtio, qemuCaps) < 0)
+        return -1;
+
     return 0;
 }
=20
@@ -3324,6 +3382,9 @@ qemuValidateDomainDeviceDefInput(const virDomainInput=
Def *input,
         return -1;
     }
=20
+    if (qemuValidateDomainVirtioOptions(input->virtio, qemuCaps) < 0)
+        return -1;
+
     return 0;
 }
=20
@@ -3353,6 +3414,9 @@ qemuValidateDomainDeviceDefMemballoon(const virDomain=
MemballoonDef *memballoon,
         return -1;
     }
=20
+    if (qemuValidateDomainVirtioOptions(memballoon->virtio, qemuCaps) < 0)
+        return -1;
+
     return 0;
 }
=20
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 7ceb3aee..7a9c65f0 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3039,48 +3039,48 @@ mymain(void)
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_DEVICE_VHOST_USER_GPU,
             QEMU_CAPS_VIRTIO_PACKED_QUEUES);
-    DO_TEST_FAILURE("virtio-options-controller-iommu", QEMU_CAPS_VIRTIO_SC=
SI);
-    DO_TEST_FAILURE("virtio-options-disk-iommu", NONE);
-    DO_TEST_FAILURE("virtio-options-fs-iommu", NONE);
-    DO_TEST_FAILURE("virtio-options-input-iommu", QEMU_CAPS_VIRTIO_MOUSE,
-                    QEMU_CAPS_VIRTIO_KEYBOARD);
-    DO_TEST_FAILURE("virtio-options-memballoon-iommu", NONE);
-    DO_TEST_FAILURE("virtio-options-net-iommu", NONE);
-    DO_TEST_FAILURE("virtio-options-rng-iommu", QEMU_CAPS_DEVICE_VIRTIO_RN=
G,
-                    QEMU_CAPS_OBJECT_RNG_RANDOM);
-    DO_TEST_FAILURE("virtio-options-video-iommu", QEMU_CAPS_DEVICE_VIRTIO_=
GPU,
-                    QEMU_CAPS_DEVICE_VIRTIO_GPU,
-                    QEMU_CAPS_VIRTIO_GPU_VIRGL,
-                    QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
-                    QEMU_CAPS_DEVICE_VHOST_USER_GPU);
-    DO_TEST_FAILURE("virtio-options-controller-ats", QEMU_CAPS_VIRTIO_SCSI=
);
-    DO_TEST_FAILURE("virtio-options-disk-ats", NONE);
-    DO_TEST_FAILURE("virtio-options-fs-ats", NONE);
-    DO_TEST_FAILURE("virtio-options-input-ats", QEMU_CAPS_VIRTIO_MOUSE,
-                    QEMU_CAPS_VIRTIO_KEYBOARD);
-    DO_TEST_FAILURE("virtio-options-memballoon-ats", NONE);
-    DO_TEST_FAILURE("virtio-options-net-ats", NONE);
-    DO_TEST_FAILURE("virtio-options-rng-ats", QEMU_CAPS_DEVICE_VIRTIO_RNG,
-                    QEMU_CAPS_OBJECT_RNG_RANDOM);
-    DO_TEST_FAILURE("virtio-options-video-ats", QEMU_CAPS_DEVICE_VIRTIO_GP=
U,
-                    QEMU_CAPS_DEVICE_VIRTIO_GPU,
-                    QEMU_CAPS_VIRTIO_GPU_VIRGL,
-                    QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
-                    QEMU_CAPS_DEVICE_VHOST_USER_GPU);
-    DO_TEST_FAILURE("virtio-options-controller-packed", QEMU_CAPS_VIRTIO_S=
CSI);
-    DO_TEST_FAILURE("virtio-options-disk-packed", NONE);
-    DO_TEST_FAILURE("virtio-options-fs-packed", NONE);
-    DO_TEST_FAILURE("virtio-options-input-packed", QEMU_CAPS_VIRTIO_MOUSE,
-                    QEMU_CAPS_VIRTIO_KEYBOARD);
-    DO_TEST_FAILURE("virtio-options-memballoon-packed", NONE);
-    DO_TEST_FAILURE("virtio-options-net-packed", NONE);
-    DO_TEST_FAILURE("virtio-options-rng-packed", QEMU_CAPS_DEVICE_VIRTIO_R=
NG,
-                    QEMU_CAPS_OBJECT_RNG_RANDOM);
-    DO_TEST_FAILURE("virtio-options-video-packed", QEMU_CAPS_DEVICE_VIRTIO=
_GPU,
-                    QEMU_CAPS_DEVICE_VIRTIO_GPU,
-                    QEMU_CAPS_VIRTIO_GPU_VIRGL,
-                    QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
-                    QEMU_CAPS_DEVICE_VHOST_USER_GPU);
+    DO_TEST_PARSE_ERROR("virtio-options-controller-iommu", QEMU_CAPS_VIRTI=
O_SCSI);
+    DO_TEST_PARSE_ERROR("virtio-options-disk-iommu", NONE);
+    DO_TEST_PARSE_ERROR("virtio-options-fs-iommu", NONE);
+    DO_TEST_PARSE_ERROR("virtio-options-input-iommu", QEMU_CAPS_VIRTIO_MOU=
SE,
+                        QEMU_CAPS_VIRTIO_KEYBOARD);
+    DO_TEST_PARSE_ERROR("virtio-options-net-iommu", NONE);
+    DO_TEST_PARSE_ERROR("virtio-options-memballoon-iommu", NONE);
+    DO_TEST_PARSE_ERROR("virtio-options-rng-iommu", QEMU_CAPS_DEVICE_VIRTI=
O_RNG,
+                        QEMU_CAPS_OBJECT_RNG_RANDOM);
+    DO_TEST_PARSE_ERROR("virtio-options-video-iommu", QEMU_CAPS_DEVICE_VIR=
TIO_GPU,
+                        QEMU_CAPS_DEVICE_VIRTIO_GPU,
+                        QEMU_CAPS_VIRTIO_GPU_VIRGL,
+                        QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
+                        QEMU_CAPS_DEVICE_VHOST_USER_GPU);
+    DO_TEST_PARSE_ERROR("virtio-options-controller-ats", QEMU_CAPS_VIRTIO_=
SCSI);
+    DO_TEST_PARSE_ERROR("virtio-options-disk-ats", NONE);
+    DO_TEST_PARSE_ERROR("virtio-options-fs-ats", NONE);
+    DO_TEST_PARSE_ERROR("virtio-options-input-ats", QEMU_CAPS_VIRTIO_MOUSE,
+                        QEMU_CAPS_VIRTIO_KEYBOARD);
+    DO_TEST_PARSE_ERROR("virtio-options-memballoon-ats", NONE);
+    DO_TEST_PARSE_ERROR("virtio-options-net-ats", NONE);
+    DO_TEST_PARSE_ERROR("virtio-options-rng-ats", QEMU_CAPS_DEVICE_VIRTIO_=
RNG,
+                        QEMU_CAPS_OBJECT_RNG_RANDOM);
+    DO_TEST_PARSE_ERROR("virtio-options-video-ats", QEMU_CAPS_DEVICE_VIRTI=
O_GPU,
+                        QEMU_CAPS_DEVICE_VIRTIO_GPU,
+                        QEMU_CAPS_VIRTIO_GPU_VIRGL,
+                        QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
+                        QEMU_CAPS_DEVICE_VHOST_USER_GPU);
+    DO_TEST_PARSE_ERROR("virtio-options-controller-packed", QEMU_CAPS_VIRT=
IO_SCSI);
+    DO_TEST_PARSE_ERROR("virtio-options-disk-packed", NONE);
+    DO_TEST_PARSE_ERROR("virtio-options-fs-packed", NONE);
+    DO_TEST_PARSE_ERROR("virtio-options-input-packed", QEMU_CAPS_VIRTIO_MO=
USE,
+                        QEMU_CAPS_VIRTIO_KEYBOARD);
+    DO_TEST_PARSE_ERROR("virtio-options-memballoon-packed", NONE);
+    DO_TEST_PARSE_ERROR("virtio-options-net-packed", NONE);
+    DO_TEST_PARSE_ERROR("virtio-options-rng-packed", QEMU_CAPS_DEVICE_VIRT=
IO_RNG,
+                        QEMU_CAPS_OBJECT_RNG_RANDOM);
+    DO_TEST_PARSE_ERROR("virtio-options-video-packed", QEMU_CAPS_DEVICE_VI=
RTIO_GPU,
+                        QEMU_CAPS_DEVICE_VIRTIO_GPU,
+                        QEMU_CAPS_VIRTIO_GPU_VIRGL,
+                        QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
+                        QEMU_CAPS_DEVICE_VHOST_USER_GPU);
=20
     DO_TEST("fd-memory-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE,
             QEMU_CAPS_KVM);
--=20
2.24.1


From nobody Sun May  5 08:36:50 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 205.139.110.120 as permitted sender) client-ip=205.139.110.120;
 envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail(p=none dis=none)  header.from=linux.ibm.com
ARC-Seal: i=1; a=rsa-sha256; t=1587647739; cv=none;
	d=zohomail.com; s=zohoarc;
	b=MU51D3grxAw2eczrnp5IE1ZiTJuQgCyVlM2VZuLwVuDQdAzcBnF5p+F4gd87GNfVD5OPbM/EkC4B6MNGbRF4HOUNinlT1BAyw6jAPdfCs1Yg8PgyE0wAwT/KFP0iKPqeNF9etRflFG1KT6KyovrxtzUJ4ImPI6JyhrgePl9mc0k=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1587647739;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=2+J5dLTRmGjk967OFYdOJdaIDxfK7+oPcmnajKHr2+E=;
	b=CWFE0hoF+YjQEgq0sKPFJ4WPAsEwv3t0DaGluKHIN4BiOl6elIif9ICbgDRQWECHS0hzJ0+zlAufLNXttdryAPqPVUR6N4SPM3vekKHZ6HKaNvMG8qU1EqgrDjldrdl/iLka5ARJIpWUtTwpwJ1PMENKKErumCSHm3fljNn/Gbs=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail header.from=<bwalk@linux.ibm.com> (p=none dis=none)
 header.from=<bwalk@linux.ibm.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
 [205.139.110.120]) by mx.zohomail.com
	with SMTPS id 1587647739878721.5773883695164;
 Thu, 23 Apr 2020 06:15:39 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-334-Z45yjYlVPoeiL7RX_w5YdA-1; Thu, 23 Apr 2020 09:15:35 -0400
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 592FB800C78;
	Thu, 23 Apr 2020 13:15:30 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 484435D715;
	Thu, 23 Apr 2020 13:15:29 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id B7A201809542;
	Thu, 23 Apr 2020 13:15:26 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 03NDFOvw032165 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 23 Apr 2020 09:15:24 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id A8EEA10CD936; Thu, 23 Apr 2020 13:15:24 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id A372410CD935
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 13:15:22 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 89684800C6D
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 13:15:22 +0000 (UTC)
Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com
	[148.163.156.1]) (Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-89-mKOEd2gRPC2FaY_virUTXw-1; Thu, 23 Apr 2020 09:15:20 -0400
Received: from pps.filterd (m0098393.ppops.net [127.0.0.1])
	by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id
	03ND4GsX107418
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 09:15:19 -0400
Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103])
	by mx0a-001b2d01.pphosted.com with ESMTP id 30gmv20hbg-1
	(version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT)
	for <libvir-list@redhat.com>; Thu, 23 Apr 2020 09:15:18 -0400
Received: from localhost
	by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use
	Only! Violators will be prosecuted
	for <libvir-list@redhat.com> from <bwalk@linux.ibm.com>;
	Thu, 23 Apr 2020 14:15:10 +0100
Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197)
	by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway:
	Authorized Use Only! Violators will be prosecuted;
	(version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256)
	Thu, 23 Apr 2020 14:15:09 +0100
Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com
	[9.149.105.232])
	by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with
	ESMTP id 03NDFDMJ23199806
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256
	verify=OK); Thu, 23 Apr 2020 13:15:13 GMT
Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1])
	by IMSVA (Postfix) with ESMTP id 6D5305206B;
	Thu, 23 Apr 2020 13:15:13 +0000 (GMT)
Received: from m46lp64.lnxne.boe (unknown [9.152.108.100])
	by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 4FA545205F;
	Thu, 23 Apr 2020 13:15:13 +0000 (GMT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1587647738;
	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=2+J5dLTRmGjk967OFYdOJdaIDxfK7+oPcmnajKHr2+E=;
	b=dLKrhcrojIZoQq/beW+CpakQCDtls2GumphNWz54LGqNC5H3yYZM00ETUkanTim5YyKxaQ
	5y3zA1HHRFtj/sHLbMTQZOZyPLQBPhlh2doUJtpqbpQeS/jrXxU78zt59HbIgUXaSPFYW/
	AGggJY04vWae3X/sswnH8qBn3D+EYf0=
X-MC-Unique: Z45yjYlVPoeiL7RX_w5YdA-1
X-MC-Unique: mKOEd2gRPC2FaY_virUTXw-1
From: Bjoern Walk <bwalk@linux.ibm.com>
To: libvir-list@redhat.com
Subject: [PATCH 4/4] qemu: command: make qemuBuildVirtioOptionsStr void
Date: Thu, 23 Apr 2020 15:15:09 +0200
In-Reply-To: <20200423131509.2708173-1-bwalk@linux.ibm.com>
References: <20200423131509.2708173-1-bwalk@linux.ibm.com>
MIME-Version: 1.0
X-TM-AS-GCONF: 00
x-cbid: 20042313-0028-0000-0000-000003FD995C
X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused
x-cbparentid: 20042313-0029-0000-0000-000024C36486
Message-Id: <20200423131509.2708173-5-bwalk@linux.ibm.com>
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676
	definitions=2020-04-23_10:2020-04-22,
	2020-04-23 signatures=0
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0
	mlxscore=0 clxscore=1015
	priorityscore=1501 impostorscore=0 adultscore=0 malwarescore=0
	suspectscore=1 phishscore=0 spamscore=0 bulkscore=0 mlxlogscore=869
	lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1
	engine=8.12.0-2003020000 definitions=main-2004230099
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-MIME-Autoconverted: from quoted-printable to 8bit by
	lists01.pubmisc.prod.ext.phx2.redhat.com id 03NDFOvw032165
X-loop: libvir-list@redhat.com
Cc: Bjoern Walk <bwalk@linux.ibm.com>,
	Daniel Henrique Barboza <danielhb413@gmail.com>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.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://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
Content-Type: text/plain; charset="utf-8"

Now that qemuBuildVirtioOptionsStr can not fail anymore, remove its
return value and make it void.

Signed-off-by: Bjoern Walk <bwalk@linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/qemu/qemu_command.c | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index ca9d3f10..169a418f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -586,12 +586,12 @@ qemuBuildVirtioDevStr(virBufferPtr buf,
     return 0;
 }
=20
-static int
+static void
 qemuBuildVirtioOptionsStr(virBufferPtr buf,
                           virDomainVirtioOptionsPtr virtio)
 {
     if (!virtio)
-        return 0;
+        return;
=20
     if (virtio->iommu !=3D VIR_TRISTATE_SWITCH_ABSENT) {
         virBufferAsprintf(buf, ",iommu_platform=3D%s",
@@ -605,8 +605,6 @@ qemuBuildVirtioOptionsStr(virBufferPtr buf,
         virBufferAsprintf(buf, ",packed=3D%s",
                           virTristateSwitchTypeToString(virtio->packed));
     }
-
-    return 0;
 }
=20
 static int
@@ -2131,8 +2129,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def,
             virBufferAsprintf(&opt, ",num-queues=3D%u", disk->queues);
         }
=20
-        if (qemuBuildVirtioOptionsStr(&opt, disk->virtio) < 0)
-            return NULL;
+        qemuBuildVirtioOptionsStr(&opt, disk->virtio);
=20
         if (qemuBuildDeviceAddressStr(&opt, def, &disk->info, qemuCaps) < =
0)
             return NULL;
@@ -2596,8 +2593,7 @@ qemuBuildVHostUserFsCommandLine(virCommandPtr cmd,
         virBufferAsprintf(&opt, ",queue-size=3D%llu", fs->queue_size);
     virBufferAddLit(&opt, ",tag=3D");
     virQEMUBuildBufferEscapeComma(&opt, fs->dst);
-    if (qemuBuildVirtioOptionsStr(&opt, fs->virtio) < 0)
-        return -1;
+    qemuBuildVirtioOptionsStr(&opt, fs->virtio);
=20
     if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, priv->qemuCaps) < =
0)
         return -1;
@@ -2666,8 +2662,7 @@ qemuBuildFSDevStr(const virDomainDef *def,
     virBufferAddLit(&opt, ",mount_tag=3D");
     virQEMUBuildBufferEscapeComma(&opt, fs->dst);
=20
-    if (qemuBuildVirtioOptionsStr(&opt, fs->virtio) < 0)
-        return NULL;
+    qemuBuildVirtioOptionsStr(&opt, fs->virtio);
=20
     if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, qemuCaps) < 0)
         return NULL;
@@ -2898,8 +2893,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD=
ef,
                                   def->iothread);
             }
=20
-            if (qemuBuildVirtioOptionsStr(&buf, def->virtio) < 0)
-                return -1;
+            qemuBuildVirtioOptionsStr(&buf, def->virtio);
             break;
         case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC:
             virBufferAddLit(&buf, "lsi");
@@ -2945,8 +2939,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD=
ef,
             virBufferAsprintf(&buf, ",vectors=3D%d",
                               def->opts.vioserial.vectors);
         }
-        if (qemuBuildVirtioOptionsStr(&buf, def->virtio) < 0)
-            return -1;
+        qemuBuildVirtioOptionsStr(&buf, def->virtio);
         break;
=20
     case VIR_DOMAIN_CONTROLLER_TYPE_CCID:
@@ -3896,9 +3889,8 @@ qemuBuildNicDevStr(virDomainDefPtr def,
         return NULL;
     if (bootindex)
         virBufferAsprintf(&buf, ",bootindex=3D%u", bootindex);
-    if (usingVirtio &&
-        qemuBuildVirtioOptionsStr(&buf, net->virtio) < 0)
-        return NULL;
+    if (usingVirtio)
+        qemuBuildVirtioOptionsStr(&buf, net->virtio);
=20
     return virBufferContentAndReset(&buf);
 }
@@ -4139,8 +4131,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd,
                           virTristateSwitchTypeToString(def->memballoon->a=
utodeflate));
     }
=20
-    if (qemuBuildVirtioOptionsStr(&buf, def->memballoon->virtio) < 0)
-        return -1;
+    qemuBuildVirtioOptionsStr(&buf, def->memballoon->virtio);
=20
     if (qemuCommandAddExtDevice(cmd, &def->memballoon->info) < 0)
         return -1;
@@ -4231,8 +4222,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def,
     if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
         return NULL;
=20
-    if (qemuBuildVirtioOptionsStr(&buf, dev->virtio) < 0)
-        return NULL;
+    qemuBuildVirtioOptionsStr(&buf, dev->virtio);
=20
     return virBufferContentAndReset(&buf);
 }
@@ -4542,8 +4532,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
     if (qemuBuildDeviceAddressStr(&buf, def, &video->info, qemuCaps) < 0)
         return NULL;
=20
-    if (qemuBuildVirtioOptionsStr(&buf, video->virtio) < 0)
-        return NULL;
+    qemuBuildVirtioOptionsStr(&buf, video->virtio);
=20
     return virBufferContentAndReset(&buf);
 }
@@ -5758,8 +5747,7 @@ qemuBuildRNGDevStr(const virDomainDef *def,
             virBufferAddLit(&buf, ",period=3D1000");
     }
=20
-    if (qemuBuildVirtioOptionsStr(&buf, dev->virtio) < 0)
-        return NULL;
+    qemuBuildVirtioOptionsStr(&buf, dev->virtio);
=20
     if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
         return NULL;
--=20
2.24.1