From: Philipp Hahn <hahn@univention.de>
Date: Thu, 19 May 2016 06:24:56 +0000 (+0200)
Subject: xen: test for driver=tap2 sub-type in xen-xm
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f5ee412dc1d2265239b861febb1e434b4ee23402;p=libvirt.git

xen: test for driver=tap2 sub-type in xen-xm

tap2 only handles 'aio', but not 'raw', which must be explicitly given:

XML:raw needs to be translated to XM:aio for 'tap' and 'tap2' Xen
drivers.
---

diff --git a/tests/xmconfigdata/test-disk-drv-blktap-raw.cfg b/tests/xmconfigdata/test-disk-drv-blktap-raw.cfg
new file mode 100644
index 0000000000..aa38bc1a71
--- /dev/null
+++ b/tests/xmconfigdata/test-disk-drv-blktap-raw.cfg
@@ -0,0 +1,12 @@
+name = "XenGuest1"
+uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809"
+maxmem = 579
+memory = 394
+vcpus = 2
+localtime = 0
+on_poweroff = "destroy"
+on_reboot = "restart"
+on_crash = "restart"
+vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]
+bootloader = "/usr/bin/pygrub"
+disk = [ "tap:aio:/root/some.img,xvda,w" ]
diff --git a/tests/xmconfigdata/test-disk-drv-blktap-raw.xml b/tests/xmconfigdata/test-disk-drv-blktap-raw.xml
new file mode 100644
index 0000000000..cf859bad93
--- /dev/null
+++ b/tests/xmconfigdata/test-disk-drv-blktap-raw.xml
@@ -0,0 +1,33 @@
+<domain type='xen'>
+  <name>XenGuest1</name>
+  <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>592896</memory>
+  <currentMemory unit='KiB'>403456</currentMemory>
+  <vcpu placement='static'>2</vcpu>
+  <bootloader>/usr/bin/pygrub</bootloader>
+  <os>
+    <type arch='i686' machine='xenpv'>linux</type>
+  </os>
+  <clock offset='utc' adjustment='reset'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <disk type='file' device='disk'>
+      <driver name='tap' type='raw'/>
+      <source file='/root/some.img'/>
+      <target dev='xvda' bus='xen'/>
+    </disk>
+    <interface type='bridge'>
+      <mac address='00:16:3e:66:94:9c'/>
+      <source bridge='br0'/>
+      <script path='vif-bridge'/>
+    </interface>
+    <console type='pty'>
+      <target type='xen' port='0'/>
+    </console>
+    <input type='mouse' bus='xen'/>
+    <input type='keyboard' bus='xen'/>
+    <memballoon model='xen'/>
+  </devices>
+</domain>
diff --git a/tests/xmconfigdata/test-disk-drv-blktap2-raw.cfg b/tests/xmconfigdata/test-disk-drv-blktap2-raw.cfg
new file mode 100644
index 0000000000..c74e543efa
--- /dev/null
+++ b/tests/xmconfigdata/test-disk-drv-blktap2-raw.cfg
@@ -0,0 +1,12 @@
+name = "XenGuest1"
+uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809"
+maxmem = 579
+memory = 394
+vcpus = 2
+localtime = 0
+on_poweroff = "destroy"
+on_reboot = "restart"
+on_crash = "restart"
+vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]
+bootloader = "/usr/bin/pygrub"
+disk = [ "tap2:aio:/root/some.img,xvda,w" ]
diff --git a/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml b/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml
new file mode 100644
index 0000000000..af2519aa93
--- /dev/null
+++ b/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml
@@ -0,0 +1,33 @@
+<domain type='xen'>
+  <name>XenGuest1</name>
+  <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>592896</memory>
+  <currentMemory unit='KiB'>403456</currentMemory>
+  <vcpu placement='static'>2</vcpu>
+  <bootloader>/usr/bin/pygrub</bootloader>
+  <os>
+    <type arch='i686' machine='xenpv'>linux</type>
+  </os>
+  <clock offset='utc' adjustment='reset'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <disk type='file' device='disk'>
+      <driver name='tap2' type='raw'/>
+      <source file='/root/some.img'/>
+      <target dev='xvda' bus='xen'/>
+    </disk>
+    <interface type='bridge'>
+      <mac address='00:16:3e:66:94:9c'/>
+      <source bridge='br0'/>
+      <script path='vif-bridge'/>
+    </interface>
+    <console type='pty'>
+      <target type='xen' port='0'/>
+    </console>
+    <input type='mouse' bus='xen'/>
+    <input type='keyboard' bus='xen'/>
+    <memballoon model='xen'/>
+  </devices>
+</domain>
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index 9b21a13f59..8964a2a43a 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -249,6 +249,9 @@ mymain(void)
     DO_TEST("no-source-cdrom");
     DO_TEST("pci-devs");
 
+    DO_TEST("disk-drv-blktap-raw");
+    DO_TEST("disk-drv-blktap2-raw");
+
     virObjectUnref(caps);
     virObjectUnref(xmlopt);