4:43 p.m.
We have two leftover "capabilites" for qemu-img:
QEMU_IMG_BACKING_FORMAT_OPTIONS
QEMU_IMG_BACKING_FORMAT_OPTIONS_COMPAT
The former says we are able to specify the backing format via -o
(which has been the case for a long time now) and the second one
says we can use -o compat to specify the qcow2 version.
Since we require QEMU 1.5.0, we can always assume -o compat,
which was introduced in QEMU 1.1.
Drop the test cases using FMT_OPTIONS which have a FMT_COMPAT
counterpart to prepare for deprecating FMT_OPTIONS (and these flags)
completely.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
.../qcow2-convert-nobacking.argv | 2 --
.../storagevolxml2argvdata/qcow2-from-logical.argv | 2 --
.../qcow2-nobacking-convert-prealloc.argv | 2 --
.../qcow2-nobacking-prealloc.argv | 2 --
tests/storagevolxml2argvdata/qcow2.argv | 2 --
tests/storagevolxml2argvtest.c | 37 ----------------------
6 files changed, 47 deletions(-)
delete mode 100644 tests/storagevolxml2argvdata/qcow2-convert-nobacking.argv
delete mode 100644 tests/storagevolxml2argvdata/qcow2-from-logical.argv
delete mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc.argv
delete mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-prealloc.argv
delete mode 100644 tests/storagevolxml2argvdata/qcow2.argv
diff --git a/tests/storagevolxml2argvdata/qcow2-convert-nobacking.argv
b/tests/storagevolxml2argvdata/qcow2-convert-nobacking.argv
deleted file mode 100644
index fd1f4c078..000000000
--- a/tests/storagevolxml2argvdata/qcow2-convert-nobacking.argv
+++ /dev/null
@@ -1,2 +0,0 @@
-qemu-img convert -f raw -O qcow2 -o encryption=on \
-/var/lib/libvirt/images/sparse.img /var/lib/libvirt/images/OtherDemo.img
diff --git a/tests/storagevolxml2argvdata/qcow2-from-logical.argv
b/tests/storagevolxml2argvdata/qcow2-from-logical.argv
deleted file mode 100644
index 6a7581564..000000000
--- a/tests/storagevolxml2argvdata/qcow2-from-logical.argv
+++ /dev/null
@@ -1,2 +0,0 @@
-qemu-img convert -f raw -O qcow2 -o encryption=on /dev/HostVG/Swap \
-/var/lib/libvirt/images/OtherDemo.img
diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc.argv
b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc.argv
deleted file mode 100644
index a49285f89..000000000
--- a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc.argv
+++ /dev/null
@@ -1,2 +0,0 @@
-qemu-img convert -f raw -O qcow2 -o encryption=on,preallocation=metadata \
-/var/lib/libvirt/images/sparse.img /var/lib/libvirt/images/OtherDemo.img
diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc.argv
b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc.argv
deleted file mode 100644
index c74258882..000000000
--- a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc.argv
+++ /dev/null
@@ -1,2 +0,0 @@
-qemu-img create -f qcow2 -o encryption=on,preallocation=metadata \
-/var/lib/libvirt/images/OtherDemo.img 5242880K
diff --git a/tests/storagevolxml2argvdata/qcow2.argv
b/tests/storagevolxml2argvdata/qcow2.argv
deleted file mode 100644
index 6ca9a45f0..000000000
--- a/tests/storagevolxml2argvdata/qcow2.argv
+++ /dev/null
@@ -1,2 +0,0 @@
-qemu-img create -f qcow2 -b /dev/null -o backing_fmt=raw,encryption=on \
-/var/lib/libvirt/images/OtherDemo.img 5242880K
diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c
index 5857d5e35..4353ad467 100644
--- a/tests/storagevolxml2argvtest.c
+++ b/tests/storagevolxml2argvtest.c
@@ -198,40 +198,6 @@ mymain(void)
DO_TEST("pool-dir", "vol-qcow2",
NULL, NULL,
- "qcow2", 0, FMT_OPTIONS);
- DO_TEST_FAIL("pool-dir", "vol-qcow2",
- NULL, NULL,
- "qcow2-prealloc", flags, FMT_OPTIONS);
- DO_TEST("pool-dir", "vol-qcow2-nobacking",
- NULL, NULL,
- "qcow2-nobacking-prealloc", flags, FMT_OPTIONS);
- DO_TEST("pool-dir", "vol-qcow2-nobacking",
- "pool-dir", "vol-file",
- "qcow2-nobacking-convert-prealloc", flags, FMT_OPTIONS);
- DO_TEST_FAIL("pool-dir", "vol-qcow2",
- "pool-dir", "vol-file",
- "qcow2-convert-nobacking", 0, FMT_OPTIONS);
- DO_TEST_FAIL("pool-dir", "vol-qcow2",
- "pool-dir", "vol-file",
- "qcow2-convert-prealloc", flags, FMT_OPTIONS);
- DO_TEST("pool-dir", "vol-qcow2-lazy",
- NULL, NULL,
- "qcow2-lazy", 0, FMT_OPTIONS);
- DO_TEST("pool-dir", "vol-qcow2-1.1",
- NULL, NULL,
- "qcow2-1.1", 0, FMT_OPTIONS);
- DO_TEST_FAIL("pool-dir", "vol-qcow2-0.10-lazy",
- NULL, NULL,
- "qcow2-0.10-lazy", 0, FMT_OPTIONS);
- DO_TEST("pool-dir", "vol-qcow2-nobacking",
- "pool-logical", "vol-logical",
- "qcow2-from-logical", 0, FMT_OPTIONS);
- DO_TEST("pool-logical", "vol-logical",
- "pool-dir", "vol-qcow2-nobacking",
- "logical-from-qcow2", 0, FMT_OPTIONS);
-
- DO_TEST("pool-dir", "vol-qcow2",
- NULL, NULL,
"qcow2-compat", 0, FMT_COMPAT);
DO_TEST("pool-dir", "vol-qcow2-nobacking",
NULL, NULL,
@@ -256,9 +222,6 @@ mymain(void)
"logical-from-qcow2", 0, FMT_COMPAT);
DO_TEST("pool-dir", "vol-qcow2-nocow",
NULL, NULL,
- "qcow2-nocow", 0, FMT_OPTIONS);
- DO_TEST("pool-dir", "vol-qcow2-nocow",
- NULL, NULL,
"qcow2-nocow-compat", 0, FMT_COMPAT);
DO_TEST("pool-dir", "vol-qcow2-nocapacity",
"pool-dir", "vol-file",
--
2.13.6