From f5ee412dc1d2265239b861febb1e434b4ee23402 Mon Sep 17 00:00:00 2001 From: Philipp Hahn Date: Thu, 19 May 2016 08:24:56 +0200 Subject: [PATCH] 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. --- .../xmconfigdata/test-disk-drv-blktap-raw.cfg | 12 +++++++ .../xmconfigdata/test-disk-drv-blktap-raw.xml | 33 +++++++++++++++++++ .../test-disk-drv-blktap2-raw.cfg | 12 +++++++ .../test-disk-drv-blktap2-raw.xml | 33 +++++++++++++++++++ tests/xmconfigtest.c | 3 ++ 5 files changed, 93 insertions(+) create mode 100644 tests/xmconfigdata/test-disk-drv-blktap-raw.cfg create mode 100644 tests/xmconfigdata/test-disk-drv-blktap-raw.xml create mode 100644 tests/xmconfigdata/test-disk-drv-blktap2-raw.cfg create mode 100644 tests/xmconfigdata/test-disk-drv-blktap2-raw.xml 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 @@ + + XenGuest1 + c7a5fdb0-cdaf-9455-926a-d65c16db1809 + 592896 + 403456 + 2 + /usr/bin/pygrub + + linux + + + destroy + restart + restart + + + + + + + + + +