Commit 142b9ca5 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8c9ee217 dc62da88

block/parallels.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

    }