|
 |
9ae3a8 |
From 5be29b09f5d571260cb48bc4a24f32265662fed1 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 25 Mar 2014 14:23:09 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 02/49] qemu-iotests: add ./check -cloop support
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1395753835-7591-3-git-send-email-kwolf@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: n/a
|
|
|
9ae3a8 |
O-Subject: [virt-devel] [EMBARGOED RHEL-7.0 qemu-kvm PATCH 02/48] qemu-iotests: add ./check -cloop support
|
|
|
9ae3a8 |
Bugzilla: 1066691
|
|
|
9ae3a8 |
RH-Acked-by: Jeff Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1066691
|
|
|
9ae3a8 |
Upstream status: Series embargoed
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Add the cloop block driver to qemu-iotests.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
tests/qemu-iotests/common | 7 +++++++
|
|
|
9ae3a8 |
tests/qemu-iotests/common.rc | 3 +++
|
|
|
9ae3a8 |
2 files changed, 10 insertions(+), 0 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
|
|
|
9ae3a8 |
index 8cde7f1..b5043fc 100644
|
|
|
9ae3a8 |
--- a/tests/qemu-iotests/common
|
|
|
9ae3a8 |
+++ b/tests/qemu-iotests/common
|
|
|
9ae3a8 |
@@ -129,6 +129,7 @@ common options
|
|
|
9ae3a8 |
check options
|
|
|
9ae3a8 |
-raw test raw (default)
|
|
|
9ae3a8 |
-cow test cow
|
|
|
9ae3a8 |
+ -cloop test cloop
|
|
|
9ae3a8 |
-qcow test qcow
|
|
|
9ae3a8 |
-qcow2 test qcow2
|
|
|
9ae3a8 |
-qed test qed
|
|
|
9ae3a8 |
@@ -167,6 +168,12 @@ testlist options
|
|
|
9ae3a8 |
xpand=false
|
|
|
9ae3a8 |
;;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+ -cloop)
|
|
|
9ae3a8 |
+ IMGFMT=cloop
|
|
|
9ae3a8 |
+ IMGFMT_GENERIC=false
|
|
|
9ae3a8 |
+ xpand=false
|
|
|
9ae3a8 |
+ ;;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
-qcow)
|
|
|
9ae3a8 |
IMGFMT=qcow
|
|
|
9ae3a8 |
xpand=false
|
|
|
9ae3a8 |
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
|
|
|
9ae3a8 |
index 7f62457..65c5bc1 100644
|
|
|
9ae3a8 |
--- a/tests/qemu-iotests/common.rc
|
|
|
9ae3a8 |
+++ b/tests/qemu-iotests/common.rc
|
|
|
9ae3a8 |
@@ -350,6 +350,9 @@ _fail()
|
|
|
9ae3a8 |
#
|
|
|
9ae3a8 |
_supported_fmt()
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
+ # "generic" is suitable for most image formats. For some formats it doesn't
|
|
|
9ae3a8 |
+ # work, however (most notably read-only formats), so they can opt out by
|
|
|
9ae3a8 |
+ # setting IMGFMT_GENERIC to false.
|
|
|
9ae3a8 |
for f; do
|
|
|
9ae3a8 |
if [ "$f" = "$IMGFMT" -o "$f" = "generic" -a "$IMGFMT_GENERIC" = "true" ]; then
|
|
|
9ae3a8 |
return
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|