ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE----- 

iQEcBAABAgAGBQJY2jXGAAoJEJykq7OBq3PIancIAMKmUvcRoOKv0jfq3bnT3E67
 GouHtYZuQdUgx/OHJJwgCTGC1Oz+oMED6hfUMIp9vUWOb104AJycbJOXErP706fi
 659xi/NCRv8hyNsf1vwey50Ri6m7EyH2LwErDamJJx8w9/WRf87w6vk+xRjqp5by
 PSXy3aqUqrriOWmsoz4jUoP05dPGI2yqGxIqWQBC0JCBwrxEWJ28vWA1PLIftqWj
 R2dH9ZlPOPxp/rDR6xn1n2nQipMFJq278db7BSQoF7OiYsWaHZ9cEHSxMHds3eEE
 4qEMj5AejQRGK+qZO4BV1KYMSIZPVs2RazozwHSdH8fG1eP85cZcTtuyxYyxRUA=
 =Ugpp
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

# gpg: Signature made Tue 28 Mar 2017 11:07:02 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  parallels: wrong call to bdrv_truncate

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-03-28 11:10:36 +01:00
parent 8c9ee217f0 dc62da88b5
commit 142b9ca51d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/parallels.c
View File

@ -687,7 +687,8 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
if (local_err != NULL) {
goto fail_options;
}
if (!bdrv_has_zero_init(bs->file->bs) ||
if (!(flags & BDRV_O_RESIZE) || !bdrv_has_zero_init(bs->file->bs) ||
bdrv_truncate(bs->file, bdrv_getlength(bs->file->bs)) != 0) {
s->prealloc_mode = PRL_PREALLOC_MODE_FALLOCATE;
}