OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Block patches

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJUYIhvAAoJEH8JsnLIjy/WgYcP/RerfQLa10P41XqZz8Vwwf0g
 VDXQTmEE/9/K3bj2vNHoAyZCbXFtBQRIrbWs/7azbw0vpx7v9YyNDXoOxl0S6f9o
 xtVgQBOW6kzbwvDYeY/JoHDUU0m14rYrx7Nbul67GVuxe3XNF3TzeKVVwGef4WCX
 fSlw9V13Y+UJFpt+IECFl8bHo43EnwsxpxbhmNGUQOIEU9aty0LRIXXJDxNLqSd7
 rJHoQE2T89lx+B5zYobb3D3Y8zLbeyVlr2cbxCoh6BmlxUmxYBGd0PySkLgPdA/6
 YhEOfvsoDGa9entndf14jk4w93I46HZwP39XTcK+5luvr32aFJm527/WDTqMxC4A
 urPdhvz+q9IKisgNITBV8KL/sqD788rNrL/DLi+31Cv52FCV1kvT1jBAbcGVVvb4
 7PlaRmzYRtxhn/YYKJJ09MVYGz06F//4sw3c8P+Kna3h6ldstM3hmEM8Phy8bG8D
 9wqxxNlYNLRus+6pAo7aZzj2VYoi0LwwP4g+Gf+HjfmZ+35NA2rqboa45Q7X6s76
 QHNVYOQo3SpMEAuTDsq5Xy/RN6wCQk+LXkMY4fmBAQAT88PMmcHK9Jo7xZ7ZT5+j
 2Y0UfUIioltbjaXudPl11IFd3UfpmJGG9yR5T+npGK5z76WboZtQIlaKZfHgGBzJ
 09DAwXPGcgHpfCI0FUzm
 =3Cfg
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block patches

# gpg: Signature made Mon 10 Nov 2014 09:42:07 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream:
  block/vdi: Limit maximum size even futher
  qapi: Complete BlkdebugEvent
  iotests: Add test for non-existing backing file
  block: Propagate error in bdrv_img_create()
  qemu-img: Omit error_report() after img_open()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-11-10 16:28:51 +00:00
commit 558c2c8ddf
9 changed files with 87 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block.c
View File

@ -5608,11 +5608,6 @@ void bdrv_img_create(const char *filename, const char *fmt,
ret = bdrv_open(&bs, backing_file, NULL, NULL, back_flags,
backing_drv, &local_err);
if (ret < 0) {
error_setg_errno(errp, -ret, "Could not open '%s': %s",
backing_file,
error_get_pretty(local_err));
error_free(local_err);
local_err = NULL;
goto out;
}
size = bdrv_getlength(bs);

14
block/vdi.c
View File

@ -120,8 +120,18 @@ typedef unsigned char uuid_t[16];
#define VDI_IS_ALLOCATED(X) ((X) < VDI_DISCARDED)
/* max blocks in image is (0xffffffff / 4) */
#define VDI_BLOCKS_IN_IMAGE_MAX 0x3fffffff
/* The bmap will take up VDI_BLOCKS_IN_IMAGE_MAX * sizeof(uint32_t) bytes; since
* the bmap is read and written in a single operation, its size needs to be
* limited to INT_MAX; furthermore, when opening an image, the bmap size is
* rounded up to be aligned on BDRV_SECTOR_SIZE.
* Therefore this should satisfy the following:
* VDI_BLOCKS_IN_IMAGE_MAX * sizeof(uint32_t) + BDRV_SECTOR_SIZE == INT_MAX + 1
* (INT_MAX + 1 is the first value not representable as an int)
* This guarantees that any value below or equal to the constant will, when
* multiplied by sizeof(uint32_t) and rounded up to a BDRV_SECTOR_SIZE boundary,
* still be below or equal to INT_MAX. */
#define VDI_BLOCKS_IN_IMAGE_MAX \
((unsigned)((INT_MAX + 1u - BDRV_SECTOR_SIZE) / sizeof(uint32_t)))
#define VDI_DISK_SIZE_MAX ((uint64_t)VDI_BLOCKS_IN_IMAGE_MAX * \
(uint64_t)DEFAULT_CLUSTER_SIZE)

4
qapi/block-core.json
View File

@ -1422,7 +1422,9 @@
'refblock_alloc.write_blocks', 'refblock_alloc.write_table',
'refblock_alloc.switch_table', 'cluster_alloc',
'cluster_alloc_bytes', 'cluster_free', 'flush_to_os',
'flush_to_disk' ] }
'flush_to_disk', 'pwritev_rmw.head', 'pwritev_rmw.after_head',
'pwritev_rmw.tail', 'pwritev_rmw.after_tail', 'pwritev',
'pwritev_zero', 'pwritev_done', 'empty_image_prepare' ] }
##
# @BlkdebugInjectErrorOptions

4
qemu-img.c
View File

@ -1126,7 +1126,6 @@ static int img_compare(int argc, char **argv)
blk1 = img_open("image_1", filename1, fmt1, flags, true, quiet);
if (!blk1) {
error_report("Can't open file %s", filename1);
ret = 2;
goto out3;
}
@ -1134,7 +1133,6 @@ static int img_compare(int argc, char **argv)
blk2 = img_open("image_2", filename2, fmt2, flags, true, quiet);
if (!blk2) {
error_report("Can't open file %s", filename2);
ret = 2;
goto out2;
}
@ -1482,7 +1480,6 @@ static int img_convert(int argc, char **argv)
true, quiet);
g_free(id);
if (!blk[bs_i]) {
error_report("Could not open '%s'", argv[optind + bs_i]);
ret = -1;
goto out;
}
@ -2962,7 +2959,6 @@ static int img_amend(int argc, char **argv)
blk = img_open("image", filename, fmt, flags, true, quiet);
if (!blk) {
error_report("Could not open image '%s'", filename);
ret = -1;
goto out;
}

14
tests/qemu-iotests/084
View File

@ -66,15 +66,15 @@ stat -c"disk image file size in bytes: %s" "${TEST_IMG}"
# check for image size too large
# poke max image size, and appropriate blocks_in_image value
echo "Test 1: Maximum size (1024 TB):"
poke_file "$TEST_IMG" "$ds_offset" "\x00\x00\xf0\xff\xff\xff\x03\x00"
poke_file "$TEST_IMG" "$bii_offset" "\xff\xff\xff\x3f"
echo "Test 1: Maximum size (512 TB - 128 MB):"
poke_file "$TEST_IMG" "$ds_offset" "\x00\x00\x00\xf8\xff\xff\x01\x00"
poke_file "$TEST_IMG" "$bii_offset" "\x80\xff\xff\x1f"
_img_info
echo
echo "Test 2: Size too large (1024TB + 1)"
echo "Test 2: Size too large (512 TB - 128 MB + 64 kB)"
# This should be too large (-EINVAL):
poke_file "$TEST_IMG" "$ds_offset" "\x00\x00\xf1\xff\xff\xff\x03\x00"
poke_file "$TEST_IMG" "$ds_offset" "\x00\x00\x01\xf8\xff\xff\x01\x00"
_img_info
echo
@ -89,9 +89,9 @@ _img_info
echo
echo "Test 4: Size valid (64M), but Blocks In Image exceeds max allowed"
# Now check the bounds of blocks_in_image - 0x3fffffff should be the max
# Now check the bounds of blocks_in_image - 0x1fffff80 should be the max
# value here, and we should get -ENOTSUP
poke_file "$TEST_IMG" "$bii_offset" "\x00\x00\x00\x40"
poke_file "$TEST_IMG" "$bii_offset" "\x81\xff\xff\x1f"
_img_info
# Finally, 1MB is the only block size supported. Verify that

13
tests/qemu-iotests/084.out
View File

@ -17,17 +17,20 @@ file format: IMGFMT
virtual size: 64M (67108864 bytes)
cluster_size: 1048576
disk image file size in bytes: 1024
Test 1: Maximum size (1024 TB):
qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Could not open 'TEST_DIR/t.IMGFMT': Invalid argument
Test 1: Maximum size (512 TB - 128 MB):
image: TEST_DIR/t.IMGFMT
file format: IMGFMT
virtual size: 512T (562949819203584 bytes)
cluster_size: 1048576
Test 2: Size too large (1024TB + 1)
qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported VDI image size (size is 0x3fffffff10000, max supported is 0x3fffffff00000)
Test 2: Size too large (512 TB - 128 MB + 64 kB)
qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported VDI image size (size is 0x1fffff8010000, max supported is 0x1fffff8000000)
Test 3: Size valid (64M), but Blocks In Image too small (63)
qemu-img: Could not open 'TEST_DIR/t.IMGFMT': unsupported VDI image (disk size 67108864, image bitmap has room for 66060288)
Test 4: Size valid (64M), but Blocks In Image exceeds max allowed
qemu-img: Could not open 'TEST_DIR/t.IMGFMT': unsupported VDI image (too many blocks 1073741824, max is 1073741823)
qemu-img: Could not open 'TEST_DIR/t.IMGFMT': unsupported VDI image (too many blocks 536870785, max is 536870784)
Test 5: Valid Image: 64MB, Blocks In Image 64, Block Size 1MB
image: TEST_DIR/t.IMGFMT

53
tests/qemu-iotests/111 Executable file
View File

@ -0,0 +1,53 @@
#!/bin/bash
#
# Test case for non-existing backing file when creating a qcow2 image
# and not specifying the size
#
# Copyright (C) 2014 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# creator
owner=mreitz@redhat.com
seq="$(basename $0)"
echo "QA output created by $seq"
here="$PWD"
tmp=/tmp/$$
status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
_supported_fmt qed qcow qcow2 vmdk
_supported_proto file
_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
$QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \
| _filter_testdir | _filter_imgfmt
# success, all done
echo '*** done'
rm -f $seq.full
status=0

3
tests/qemu-iotests/111.out Normal file
View File

@ -0,0 +1,3 @@
QA output created by 111
qemu-img: TEST_DIR/t.IMGFMT: Could not open 'TEST_DIR/t.IMGFMT.inexistent': No such file or directory
*** done

1
tests/qemu-iotests/group
View File

@ -111,3 +111,4 @@
105 rw auto quick
107 rw auto quick
108 rw auto quick
111 rw auto quick