Commit 03d1cbe3 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2017-11-14' into staging 



Block patches for 2.11.0-rc1

# gpg: Signature made Tue 14 Nov 2017 17:22:17 GMT
# gpg:                using RSA key 0xF407DB0061D5CF40
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/maxreitz/tags/pull-block-2017-11-14:
  qemu-iotests: update unsupported image formats in 194
  block/parallels: add migration blocker
  block/parallels: Do not update header or truncate image when INMIGRATE
  block/vhdx.c: Don't blindly update the header
  iotests: 077: Filter out 'resume' lines
  block/snapshot: dirty all dirty bitmaps on snapshot-switch
  qcow2: Check that corrupted images can be repaired in iotest 060
  iotests: Use new-style NBD connections
  iotests: Make 136 less flaky
  iotests: Make 083 less flaky
  iotests: Make 055 less flaky
  iotests: Add missing 'blkdebug::' in 040
  iotests: Make 030 less flaky
  qcow2: Assert that the crypto header does not overlap other metadata
  qcow2: Add iotest for an empty refcount table
  qcow2: Add iotest for an image with header.refcount_table_offset == 0
  qcow2: Don't open images with header.refcount_table_clusters == 0
  qcow2: Prevent allocating compressed clusters at offset 0
  qcow2: Prevent allocating L2 tables at offset 0
  qcow2: Prevent allocating refcount blocks at offset 0

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 29af6de2 8b2d7c36

block/parallels.c

+17 −5
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "qemu/module.h"

#include "qemu/bswap.h"

#include "qemu/bitmap.h"

#include "migration/blocker.h"



/**************************************************************/
@@ -100,6 +101,7 @@ typedef struct BDRVParallelsState { 
    unsigned int tracks;



    unsigned int off_multiplier;

    Error *migration_blocker;

} BDRVParallelsState;
@@ -708,7 +710,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, 
        s->prealloc_mode = PRL_PREALLOC_MODE_FALLOCATE;

    }



    if (flags & BDRV_O_RDWR) {

    if ((flags & BDRV_O_RDWR) && !(flags & BDRV_O_INACTIVE)) {

        s->header->inuse = cpu_to_le32(HEADER_INUSE_MAGIC);

        ret = parallels_update_header(bs);

        if (ret < 0) {
@@ -720,6 +722,16 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, 
    s->bat_dirty_bmap =

        bitmap_new(DIV_ROUND_UP(s->header_size, s->bat_dirty_block));



    /* Disable migration until bdrv_invalidate_cache method is added */

    error_setg(&s->migration_blocker, "The Parallels format used by node '%s' "

               "does not support live migration",

               bdrv_get_device_or_node_name(bs));

    ret = migrate_add_blocker(s->migration_blocker, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        error_free(s->migration_blocker);

        goto fail;

    }

    qemu_co_mutex_init(&s->lock);

    return 0;
@@ -741,18 +753,18 @@ static void parallels_close(BlockDriverState *bs) 
{

    BDRVParallelsState *s = bs->opaque;



    if (bs->open_flags & BDRV_O_RDWR) {

    if ((bs->open_flags & BDRV_O_RDWR) && !(bs->open_flags & BDRV_O_INACTIVE)) {

        s->header->inuse = 0;

        parallels_update_header(bs);

    }



    if (bs->open_flags & BDRV_O_RDWR) {

        bdrv_truncate(bs->file, s->data_end << BDRV_SECTOR_BITS,

                      PREALLOC_MODE_OFF, NULL);

    }



    g_free(s->bat_dirty_bmap);

    qemu_vfree(s->header);



    migrate_del_blocker(s->migration_blocker);

    error_free(s->migration_blocker);

}



static QemuOptsList parallels_create_opts = {

block/qcow2-cluster.c

+8 −0
Original line number Diff line number Diff line
@@ -278,6 +278,14 @@ static int l2_allocate(BlockDriverState *bs, int l1_index, uint64_t **table) 
        goto fail;

    }



    /* If we're allocating the table at offset 0 then something is wrong */

    if (l2_offset == 0) {

        qcow2_signal_corruption(bs, true, -1, -1, "Preventing invalid "

                                "allocation of L2 table at offset 0");

        ret = -EIO;

        goto fail;

    }



    ret = qcow2_cache_flush(bs, s->refcount_block_cache);

    if (ret < 0) {

        goto fail;

block/qcow2-refcount.c

+14 −0
Original line number Diff line number Diff line
@@ -367,6 +367,13 @@ static int alloc_refcount_block(BlockDriverState *bs, 
        return new_block;

    }



    /* If we're allocating the block at offset 0 then something is wrong */

    if (new_block == 0) {

        qcow2_signal_corruption(bs, true, -1, -1, "Preventing invalid "

                                "allocation of refcount block at offset 0");

        return -EIO;

    }



#ifdef DEBUG_ALLOC2

    fprintf(stderr, "qcow2: Allocate refcount block %d for %" PRIx64

        " at %" PRIx64 "\n",
@@ -1075,6 +1082,13 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size) 
                return new_cluster;

            }



            if (new_cluster == 0) {

                qcow2_signal_corruption(bs, true, -1, -1, "Preventing invalid "

                                        "allocation of compressed cluster "

                                        "at offset 0");

                return -EIO;

            }



            if (!offset || ROUND_UP(offset, s->cluster_size) != new_cluster) {

                offset = new_cluster;

                free_in_cluster = s->cluster_size;

block/qcow2.c

+7 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ static ssize_t qcow2_crypto_hdr_init_func(QCryptoBlock *block, size_t headerlen, 
    /* Zero fill remaining space in cluster so it has predictable

     * content in case of future spec changes */

    clusterlen = size_to_clusters(s, headerlen) * s->cluster_size;

    assert(qcow2_pre_write_overlap_check(bs, 0, ret, clusterlen) == 0);

    ret = bdrv_pwrite_zeroes(bs->file,

                             ret + headerlen,

                             clusterlen - headerlen, 0);
@@ -1280,6 +1281,12 @@ static int qcow2_do_open(BlockDriverState *bs, QDict *options, int flags, 
        goto fail;

    }



    if (header.refcount_table_clusters == 0 && !(flags & BDRV_O_CHECK)) {

        error_setg(errp, "Image does not contain a reference count table");

        ret = -EINVAL;

        goto fail;

    }



    ret = validate_table_offset(bs, s->refcount_table_offset,

                                s->refcount_table_size, sizeof(uint64_t));

    if (ret < 0) {

block/snapshot.c

+14 −0
Original line number Diff line number Diff line
@@ -181,10 +181,24 @@ int bdrv_snapshot_goto(BlockDriverState *bs, 
{

    BlockDriver *drv = bs->drv;

    int ret, open_ret;

    int64_t len;



    if (!drv) {

        return -ENOMEDIUM;

    }



    len = bdrv_getlength(bs);

    if (len < 0) {

        return len;

    }

    /* We should set all bits in all enabled dirty bitmaps, because dirty

     * bitmaps reflect active state of disk and snapshot switch operation

     * actually dirties active state.

     * TODO: It may make sense not to set all bits but analyze block status of

     * current state and destination snapshot and do not set bits corresponding

     * to both-zero or both-unallocated areas. */

    bdrv_set_dirty(bs, 0, len);



    if (drv->bdrv_snapshot_goto) {

        return drv->bdrv_snapshot_goto(bs, snapshot_id);

    }