diff options
| author | Fam Zheng <famz@redhat.com> | 2013-10-11 15:43:23 +0800 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2013-10-11 16:50:01 +0200 |
| commit | 52c8d629cac27ad16dd51507b4733d46fa4efc55 (patch) | |
| tree | b20f772c96efb4899bbac8c56374822c8803d843 | |
| parent | 4823970bcb882cd5b7e9c9a21fa6573190035050 (diff) | |
vmdk: refuse enabling zeroed grain with flat images
This is a header flag and we needs sparse for the header.
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/vmdk.c | 4 | ||||
| -rwxr-xr-x | tests/qemu-iotests/059 | 4 | ||||
| -rw-r--r-- | tests/qemu-iotests/059.out | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/block/vmdk.c b/block/vmdk.c index a1aaea77e9..709aa3deb0 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1664,6 +1664,10 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options, error_setg(errp, "Flat image can't have backing file"); return -ENOTSUP; } + if (flat && zeroed_grain) { + error_setg(errp, "Flat image can't enable zeroed grain"); + return -ENOTSUP; + } if (backing_file) { BlockDriverState *bs = bdrv_new(""); ret = bdrv_open(bs, backing_file, NULL, 0, NULL, errp); diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index 18cdad1341..b81c575d94 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -71,6 +71,10 @@ echo "=== Testing monolithicFlat creation and opening ===" IMGOPTS="subformat=monolithicFlat" _make_test_img 2G $QEMU_IMG info $TEST_IMG | _filter_testdir +echo +echo "=== Testing monolithicFlat with zeroed_grain ===" +IMGOPTS="subformat=monolithicFlat,zeroed_grain=on" _make_test_img 2G + # success, all done echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index 265cd76169..9b12efb466 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -22,4 +22,8 @@ image: TEST_DIR/t.vmdk file format: vmdk virtual size: 2.0G (2147483648 bytes) disk size: 4.0K + +=== Testing monolithicFlat with zeroed_grain === +qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 *** done |