From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 25 Apr 2018 13:53:18 +0000 (+0200)
Subject: tests: qemublock: Test handling of block devices
X-Git-Tag: v4.4.0-rc1~258
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55111f35080978f78334365a8161db1d09ade418;p=thirdparty%2Flibvirt.git

tests: qemublock: Test handling of block devices

Make sure that 'host_device' is generated for type='block'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 09fef8f2a9..eae1ca8ee3 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -479,6 +479,8 @@ mymain(void)
     TEST_DISK_TO_JSON("network-qcow2-backing-chain-cache-unsafe");
     TEST_DISK_TO_JSON("dir-fat-cache");
 
+    TEST_DISK_TO_JSON("block-raw-noopts");
+
  cleanup:
     virHashFree(diskxmljsondata.schema);
     qemuTestDriverFree(&driver);
diff --git a/tests/qemublocktestdata/xml2json/block-raw-noopts.json b/tests/qemublocktestdata/xml2json/block-raw-noopts.json
new file mode 100644
index 0000000000..25bf77d5aa
--- /dev/null
+++ b/tests/qemublocktestdata/xml2json/block-raw-noopts.json
@@ -0,0 +1,12 @@
+{
+  "node-name": "0123456789ABCDEF0123456789ABCDE",
+  "read-only": false,
+  "driver": "raw",
+  "file": {
+    "driver": "host_device",
+    "filename": "/dev/blah",
+    "node-name": "0123456789ABCDEF0123456789ABCDE",
+    "read-only": false,
+    "discard": "unmap"
+  }
+}
diff --git a/tests/qemublocktestdata/xml2json/block-raw-noopts.xml b/tests/qemublocktestdata/xml2json/block-raw-noopts.xml
new file mode 100644
index 0000000000..2f319d26d0
--- /dev/null
+++ b/tests/qemublocktestdata/xml2json/block-raw-noopts.xml
@@ -0,0 +1,12 @@
+<disk device='disk' type='block'>
+  <driver name='qemu' type='raw'/>
+  <source dev='/dev/blah'>
+    <privateData>
+      <nodenames>
+        <nodename type='storage' name='0123456789ABCDEF0123456789ABCDE'/>
+        <nodename type='format' name='0123456789ABCDEF0123456789ABCDE'/>
+      </nodenames>
+    </privateData>
+  </source>
+  <target dev='vda'/>
+</disk>