|
 |
218e99 |
From 0cc9ce211d3b571e35b5440fc12a77195b7ee804 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
Date: Wed, 6 Nov 2013 16:53:41 +0100
|
|
|
218e99 |
Subject: [PATCH 84/87] vmdk: refuse enabling zeroed grain with flat images
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
Message-id: <1383756824-6921-19-git-send-email-mreitz@redhat.com>
|
|
|
218e99 |
Patchwork-id: 55573
|
|
|
218e99 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 18/21] vmdk: refuse enabling zeroed grain with flat images
|
|
|
218e99 |
Bugzilla: 980771
|
|
|
218e99 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
From: Fam Zheng <famz@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
BZ: 980771
|
|
|
218e99 |
|
|
|
218e99 |
This is a header flag and we needs sparse for the header.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
218e99 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
(cherry picked from commit 52c8d629cac27ad16dd51507b4733d46fa4efc55)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
block/vmdk.c | 4 ++++
|
|
|
218e99 |
tests/qemu-iotests/059 | 4 ++++
|
|
|
218e99 |
tests/qemu-iotests/059.out | 4 ++++
|
|
|
218e99 |
3 files changed, 12 insertions(+)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
block/vmdk.c | 4 ++++
|
|
|
218e99 |
tests/qemu-iotests/059 | 4 ++++
|
|
|
218e99 |
tests/qemu-iotests/059.out | 4 ++++
|
|
|
218e99 |
3 files changed, 12 insertions(+), 0 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/block/vmdk.c b/block/vmdk.c
|
|
|
218e99 |
index 96f9415..ccbb0c9 100644
|
|
|
218e99 |
--- a/block/vmdk.c
|
|
|
218e99 |
+++ b/block/vmdk.c
|
|
|
218e99 |
@@ -1664,6 +1664,10 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options,
|
|
|
218e99 |
error_setg(errp, "Flat image can't have backing file");
|
|
|
218e99 |
return -ENOTSUP;
|
|
|
218e99 |
}
|
|
|
218e99 |
+ if (flat && zeroed_grain) {
|
|
|
218e99 |
+ error_setg(errp, "Flat image can't enable zeroed grain");
|
|
|
218e99 |
+ return -ENOTSUP;
|
|
|
218e99 |
+ }
|
|
|
218e99 |
if (backing_file) {
|
|
|
218e99 |
BlockDriverState *bs = bdrv_new("");
|
|
|
218e99 |
ret = bdrv_open(bs, backing_file, NULL, 0, NULL, errp);
|
|
|
218e99 |
diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
|
|
|
218e99 |
index dd6addf..26d4538 100755
|
|
|
218e99 |
--- a/tests/qemu-iotests/059
|
|
|
218e99 |
+++ b/tests/qemu-iotests/059
|
|
|
218e99 |
@@ -71,6 +71,10 @@ echo
|
|
|
218e99 |
IMGOPTS="subformat=monolithicFlat" _make_test_img 2G
|
|
|
218e99 |
$QEMU_IMG info $TEST_IMG | _filter_testdir
|
|
|
218e99 |
|
|
|
218e99 |
+echo
|
|
|
218e99 |
+echo "=== Testing monolithicFlat with zeroed_grain ==="
|
|
|
218e99 |
+IMGOPTS="subformat=monolithicFlat,zeroed_grain=on" _make_test_img 2G
|
|
|
218e99 |
+
|
|
|
218e99 |
# success, all done
|
|
|
218e99 |
echo "*** done"
|
|
|
218e99 |
rm -f $seq.full
|
|
|
218e99 |
diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
|
|
|
218e99 |
index dc4f024..2b29ca9 100644
|
|
|
218e99 |
--- a/tests/qemu-iotests/059.out
|
|
|
218e99 |
+++ b/tests/qemu-iotests/059.out
|
|
|
218e99 |
@@ -22,4 +22,8 @@ image: TEST_DIR/t.vmdk
|
|
|
218e99 |
file format: vmdk
|
|
|
218e99 |
virtual size: 2.0G (2147483648 bytes)
|
|
|
218e99 |
disk size: 4.0K
|
|
|
218e99 |
+
|
|
|
218e99 |
+=== Testing monolithicFlat with zeroed_grain ===
|
|
|
218e99 |
+qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain
|
|
|
218e99 |
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648
|
|
|
218e99 |
*** done
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|