From nobody Fri May 16 08:24:29 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1496770243321613.8274387541993;
 Tue, 6 Jun 2017 10:30:43 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id E355DC04B31B;
	Tue,  6 Jun 2017 17:30:40 +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 BD0BB17963;
	Tue,  6 Jun 2017 17:30:40 +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 7129B4A48D;
	Tue,  6 Jun 2017 17:30:40 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
	[10.5.11.12])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id v56Bcmq6001909 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 6 Jun 2017 07:38:48 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 37745756C4; Tue,  6 Jun 2017 11:38:48 +0000 (UTC)
Received: from icr.brq.redhat.com (dhcp129-58.brq.redhat.com [10.34.129.58])
	by smtp.corp.redhat.com (Postfix) with ESMTP id B28C1756BF
	for <libvir-list@redhat.com>; Tue,  6 Jun 2017 11:38:47 +0000 (UTC)
DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E355DC04B31B
Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com;
 dmarc=none (p=none dis=none) header.from=redhat.com
Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com;
 spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com
DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E355DC04B31B
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
To: libvir-list@redhat.com
Date: Tue,  6 Jun 2017 13:36:19 +0200
Message-Id: 
 <85415fb1ed6b522ed43cfe4cec053ff9f4e1a2d8.1496748930.git.jtomko@redhat.com>
In-Reply-To: <cover.1496748930.git.jtomko@redhat.com>
References: <cover.1496748930.git.jtomko@redhat.com>
In-Reply-To: <cover.1496748930.git.jtomko@redhat.com>
References: <cover.1496748930.git.jtomko@redhat.com>
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCHv2 05/15] qemuxml2xmltest: add virtio-options test
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>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
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-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]);
 Tue, 06 Jun 2017 17:30:41 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

Add a test case with all the virtio devices we know to demonstrate
the addition of new options.

https://bugzilla.redhat.com/show_bug.cgi?id=3D1283251
---
 .../qemuxml2argv-virtio-options.xml                | 92 ++++++++++++++++++=
++++
 .../qemuxml2xmlout-virtio-options.xml              | 92 ++++++++++++++++++=
++++
 tests/qemuxml2xmltest.c                            |  1 +
 3 files changed, 185 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml
 create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.=
xml

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml b/tests=
/qemuxml2argvdata/qemuxml2argv-virtio-options.xml
new file mode 100644
index 0000000..9ead938
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml
@@ -0,0 +1,92 @@
+<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>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <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'0x0a' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <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'0x0b' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0'>
+      <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'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x08' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x09' f=
unction=3D'0x0'/>
+    </controller>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <source dir=3D'/export/fs1'/>
+      <target dir=3D'fs1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </filesystem>
+    <filesystem type=3D'mount' accessmode=3D'mapped'>
+      <driver type=3D'path' wrpolicy=3D'immediate'/>
+      <source dir=3D'/export/fs2'/>
+      <target dir=3D'fs2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </filesystem>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:56:58:5a:5c'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:56:5a:5c:5e'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0e' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'keyboard' bus=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x10' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'tablet' bus=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x11' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'passthrough' bus=3D'virtio'>
+      <source evdev=3D'/dev/input/event1234'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x12' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <video>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'>
+        <acceleration accel3d=3D'yes'/>
+      </model>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0c' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0d' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml b/t=
ests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml
new file mode 100644
index 0000000..9ead938
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml
@@ -0,0 +1,92 @@
+<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>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <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'0x0a' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <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'0x0b' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0'>
+      <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'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x08' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x09' f=
unction=3D'0x0'/>
+    </controller>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <source dir=3D'/export/fs1'/>
+      <target dir=3D'fs1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </filesystem>
+    <filesystem type=3D'mount' accessmode=3D'mapped'>
+      <driver type=3D'path' wrpolicy=3D'immediate'/>
+      <source dir=3D'/export/fs2'/>
+      <target dir=3D'fs2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </filesystem>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:56:58:5a:5c'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:56:5a:5c:5e'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0e' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'keyboard' bus=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x10' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'tablet' bus=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x11' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'passthrough' bus=3D'virtio'>
+      <source evdev=3D'/dev/input/event1234'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x12' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <video>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'>
+        <acceleration accel3d=3D'yes'/>
+      </model>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0c' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0d' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 5e8cead..08698b1 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1106,6 +1106,7 @@ mymain(void)
=20
     DO_TEST("memorybacking-set", NONE);
     DO_TEST("memorybacking-unset", NONE);
+    DO_TEST("virtio-options", QEMU_CAPS_VIRTIO_SCSI);
=20
     virObjectUnref(cfg);
=20
--=20
2.10.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list