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