diff options
author | Philipp Hahn <hahn@univention.de> | 2016-05-19 08:24:56 +0200 |
---|---|---|
committer | Jim Fehlig <jfehlig@suse.com> | 2016-06-07 14:03:13 -0600 |
commit | f5ee412dc1d2265239b861febb1e434b4ee23402 (patch) | |
tree | d2fb5c077ea117a443949764d11a6c852616d09d /tests/xmconfigdata | |
parent | fafcc64a079eebc34c244570823c81b08c931311 (diff) | |
download | libvirt-f5ee412dc1d2265239b861febb1e434b4ee23402.tar.gz |
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.
Diffstat (limited to 'tests/xmconfigdata')
-rw-r--r-- | tests/xmconfigdata/test-disk-drv-blktap-raw.cfg | 12 | ||||
-rw-r--r-- | tests/xmconfigdata/test-disk-drv-blktap-raw.xml | 33 | ||||
-rw-r--r-- | tests/xmconfigdata/test-disk-drv-blktap2-raw.cfg | 12 | ||||
-rw-r--r-- | tests/xmconfigdata/test-disk-drv-blktap2-raw.xml | 33 |
4 files changed, 90 insertions, 0 deletions
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> |