Block patches for 2.0.0-rc3
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJTR+IOAAoJEH8JsnLIjy/WL8UP/ic9ato2QBnk0ojbUQD/fEdN LHMvofO7XvY2qOu6vpED25OxgeQcUJ5yrPaVjt0Nno597wHl9WM9Vrfx13Rd14yn DqYPptYduwvHlvUiI9tjk3SfQ8M3AbCII6v+wRueEuoJGupcHJ35usjHETGnV15S XH3PijFz56qwktbvawDtNDoFfjzG9Mtspwx8pO2ofU39awmC9/MS64DRvHjemV0c dszxf37cnWl6hN3gMdBIcNkVbPDxU2sOspG2wLaKVpxSg5nkd9i4ixgEwJNVc9n2 aIhq7WZfX2hYWsfgUbvTnLTm0powXm9UMqUb6UQrBGdAEbI1Xof/TXPYTSy4BRJ/ Eb/sBolbNe+7YsMZaPD2zo+ZDly4kH/GwpBwiwPp399Co6TkeqlEBrtBw5ps3zpC sZk14bltcVV5DUBZCnSiQuZb8j7RcSyye18gVsKe25RLLqB+iuYRsWCD01XjRPFf 6TNsyNDlrjg2qyTZwgei+wCoOSik8ooxo9yYZDgicsqpa8/f90zZbeK/M3v7sLZ+ 49ZDwFDOHa6WED3Abt3RppROY1MJzHfSr3qpBjZFaMrocmnlpIG5NTBbK5X71Iw0 eF8As3IIL+egsl2TZsDTHX30ENny3H6qfaJZ3vno2KNq3ooojvAaxGYqn1j8+HPU xomBdrvS4fevFmIfVSYv =Cz5J -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging Block patches for 2.0.0-rc3 # gpg: Signature made Fri 11 Apr 2014 13:37:34 BST using RSA key ID C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" * remotes/kevin/tags/for-upstream: block-commit: speed is an optional parameter iscsi: Remember to set ret for iscsi_open in error case bochs: Fix catalog size check bochs: Fix memory leak in bochs_open() error path Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
21e2db7260
|
@ -148,16 +148,26 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
|
|||
s->extent_blocks = 1 + (le32_to_cpu(bochs.extent) - 1) / 512;
|
||||
|
||||
s->extent_size = le32_to_cpu(bochs.extent);
|
||||
if (s->extent_size == 0) {
|
||||
error_setg(errp, "Extent size may not be zero");
|
||||
return -EINVAL;
|
||||
if (s->extent_size < BDRV_SECTOR_SIZE) {
|
||||
/* bximage actually never creates extents smaller than 4k */
|
||||
error_setg(errp, "Extent size must be at least 512");
|
||||
ret = -EINVAL;
|
||||
goto fail;
|
||||
} else if (!is_power_of_2(s->extent_size)) {
|
||||
error_setg(errp, "Extent size %" PRIu32 " is not a power of two",
|
||||
s->extent_size);
|
||||
ret = -EINVAL;
|
||||
goto fail;
|
||||
} else if (s->extent_size > 0x800000) {
|
||||
error_setg(errp, "Extent size %" PRIu32 " is too large",
|
||||
s->extent_size);
|
||||
return -EINVAL;
|
||||
ret = -EINVAL;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (s->catalog_size < bs->total_sectors / s->extent_size) {
|
||||
if (s->catalog_size < DIV_ROUND_UP(bs->total_sectors,
|
||||
s->extent_size / BDRV_SECTOR_SIZE))
|
||||
{
|
||||
error_setg(errp, "Catalog size is too small for this disk size");
|
||||
ret = -EINVAL;
|
||||
goto fail;
|
||||
|
|
|
@ -1233,6 +1233,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
|
|||
iscsi_readcapacity_sync(iscsilun, &local_err);
|
||||
if (local_err != NULL) {
|
||||
error_propagate(errp, local_err);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
bs->total_sectors = sector_lun2qemu(iscsilun->num_blocks, iscsilun);
|
||||
|
|
|
@ -1876,6 +1876,10 @@ void qmp_block_commit(const char *device,
|
|||
*/
|
||||
BlockdevOnError on_error = BLOCKDEV_ON_ERROR_REPORT;
|
||||
|
||||
if (!has_speed) {
|
||||
speed = 0;
|
||||
}
|
||||
|
||||
/* drain all i/o before commits */
|
||||
bdrv_drain_all();
|
||||
|
||||
|
|
|
@ -69,10 +69,14 @@ _use_sample_img empty.bochs.bz2
|
|||
poke_file "$TEST_IMG" "$disk_size_offset" "\x00\xc0\x0f\x00\x00\x00\x00\x7f"
|
||||
{ $QEMU_IO -c "read 2T 4k" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
|
||||
|
||||
_use_sample_img empty.bochs.bz2
|
||||
poke_file "$TEST_IMG" "$catalog_size_offset" "\x10\x00\x00\x00"
|
||||
{ $QEMU_IO -c "read 0xfbe00 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
|
||||
|
||||
echo
|
||||
echo "== Negative extent size =="
|
||||
_use_sample_img empty.bochs.bz2
|
||||
poke_file "$TEST_IMG" "$extent_size_offset" "\xff\xff\xff\xff"
|
||||
poke_file "$TEST_IMG" "$extent_size_offset" "\x00\x00\x00\x80"
|
||||
{ $QEMU_IO -c "read 768k 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir
|
||||
|
||||
echo
|
||||
|
|
|
@ -15,12 +15,14 @@ no file open, try 'help open'
|
|||
== Too small catalog bitmap for image size ==
|
||||
qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
|
||||
no file open, try 'help open'
|
||||
qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
|
||||
no file open, try 'help open'
|
||||
|
||||
== Negative extent size ==
|
||||
qemu-io: can't open device TEST_DIR/empty.bochs: Extent size 4294967295 is too large
|
||||
qemu-io: can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
|
||||
no file open, try 'help open'
|
||||
|
||||
== Zero extent size ==
|
||||
qemu-io: can't open device TEST_DIR/empty.bochs: Extent size may not be zero
|
||||
qemu-io: can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
|
||||
no file open, try 'help open'
|
||||
*** done
|
||||
|
|
Loading…
Reference in a new issue