Commit c88f1ffc authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block layer patches:

- qcow2: Fix preallocation on block devices
- backup: Make sure that source and target size match
- vmdk: Fix zero cluster handling
- Follow-up cleanups and fixes for the truncate changes
- iotests: Skip more tests if required drivers are missing

# gpg: Signature made Fri 08 May 2020 13:39:55 BST
# gpg:                using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
# gpg:                issuer "kwolf@redhat.com"
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (30 commits)
  block: Drop unused .bdrv_has_zero_init_truncate
  vhdx: Rework truncation logic
  parallels: Rework truncation logic
  ssh: Support BDRV_REQ_ZERO_WRITE for truncate
  sheepdog: Support BDRV_REQ_ZERO_WRITE for truncate
  rbd: Support BDRV_REQ_ZERO_WRITE for truncate
  nfs: Support BDRV_REQ_ZERO_WRITE for truncate
  file-win32: Support BDRV_REQ_ZERO_WRITE for truncate
  gluster: Drop useless has_zero_init callback
  qcow2: Fix preallocation on block devices
  iotests/055: Use cache.no-flush for vmdk target
  iotests: Backup with different source/target size
  backup: Make sure that source and target size match
  backup: Improve error for bdrv_getlength() failure
  iotests/283: Use consistent size for source and target
  iotests: vmdk: Enable zeroed_grained=on by default
  vmdk: Flush only once in vmdk_L2update()
  vmdk: Don't update L2 table for zero write on zero cluster
  vmdk: Fix partial overwrite of zero cluster
  vmdk: Fix zero cluster allocation
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1b8c4589 47e0b38a

block.c

+0 −21
Original line number Diff line number Diff line
@@ -5284,27 +5284,6 @@ int bdrv_has_zero_init(BlockDriverState *bs) 
    return 0;

}



int bdrv_has_zero_init_truncate(BlockDriverState *bs)

{

    if (!bs->drv) {

        return 0;

    }



    if (bs->backing) {

        /* Depends on the backing image length, but better safe than sorry */

        return 0;

    }

    if (bs->drv->bdrv_has_zero_init_truncate) {

        return bs->drv->bdrv_has_zero_init_truncate(bs);

    }

    if (bs->file && bs->drv->is_filter) {

        return bdrv_has_zero_init_truncate(bs->file->bs);

    }



    /* safe default */

    return 0;

}



bool bdrv_unallocated_blocks_are_zero(BlockDriverState *bs)

{

    BlockDriverInfo bdi;

block/backup-top.c

+9 −5
Original line number Diff line number Diff line
@@ -148,8 +148,10 @@ static void backup_top_child_perm(BlockDriverState *bs, BdrvChild *c, 
         *

         * Share write to target (child_file), to not interfere

         * with guest writes to its disk which may be in target backing chain.

         * Can't resize during a backup block job because we check the size

         * only upfront.

         */

        *nshared = BLK_PERM_ALL;

        *nshared = BLK_PERM_ALL & ~BLK_PERM_RESIZE;

        *nperm = BLK_PERM_WRITE;

    } else {

        /* Source child */
@@ -159,7 +161,7 @@ static void backup_top_child_perm(BlockDriverState *bs, BdrvChild *c, 
        if (perm & BLK_PERM_WRITE) {

            *nperm = *nperm | BLK_PERM_CONSISTENT_READ;

        }

        *nshared &= ~BLK_PERM_WRITE;

        *nshared &= ~(BLK_PERM_WRITE | BLK_PERM_RESIZE);

    }

}
@@ -192,11 +194,13 @@ BlockDriverState *bdrv_backup_top_append(BlockDriverState *source, 
{

    Error *local_err = NULL;

    BDRVBackupTopState *state;

    BlockDriverState *top = bdrv_new_open_driver(&bdrv_backup_top_filter,

                                                 filter_node_name,

                                                 BDRV_O_RDWR, errp);

    BlockDriverState *top;

    bool appended = false;



    assert(source->total_sectors == target->total_sectors);



    top = bdrv_new_open_driver(&bdrv_backup_top_filter, filter_node_name,

                               BDRV_O_RDWR, errp);

    if (!top) {

        return NULL;

    }

block/backup.c

+15 −3
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, 
                  BlockCompletionFunc *cb, void *opaque,

                  JobTxn *txn, Error **errp)

{

    int64_t len;

    int64_t len, target_len;

    BackupBlockJob *job = NULL;

    int64_t cluster_size;

    BdrvRequestFlags write_flags;
@@ -400,8 +400,20 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, 


    len = bdrv_getlength(bs);

    if (len < 0) {

        error_setg_errno(errp, -len, "unable to get length for '%s'",

                         bdrv_get_device_name(bs));

        error_setg_errno(errp, -len, "Unable to get length for '%s'",

                         bdrv_get_device_or_node_name(bs));

        goto error;

    }



    target_len = bdrv_getlength(target);

    if (target_len < 0) {

        error_setg_errno(errp, -target_len, "Unable to get length for '%s'",

                         bdrv_get_device_or_node_name(bs));

        goto error;

    }



    if (target_len != len) {

        error_setg(errp, "Source and target image have different sizes");

        goto error;

    }

block/file-posix.c

+0 −1
Original line number Diff line number Diff line
@@ -3100,7 +3100,6 @@ BlockDriver bdrv_file = { 
    .bdrv_co_create = raw_co_create,

    .bdrv_co_create_opts = raw_co_create_opts,

    .bdrv_has_zero_init = bdrv_has_zero_init_1,

    .bdrv_has_zero_init_truncate = bdrv_has_zero_init_1,

    .bdrv_co_block_status = raw_co_block_status,

    .bdrv_co_invalidate_cache = raw_co_invalidate_cache,

    .bdrv_co_pwrite_zeroes = raw_co_pwrite_zeroes,

block/file-win32.c

+3 −1
Original line number Diff line number Diff line
@@ -408,6 +408,9 @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags, 
        win32_aio_attach_aio_context(s->aio, bdrv_get_aio_context(bs));

    }



    /* When extending regular files, we get zeros from the OS */

    bs->supported_truncate_flags = BDRV_REQ_ZERO_WRITE;



    ret = 0;

fail:

    qemu_opts_del(opts);
@@ -638,7 +641,6 @@ BlockDriver bdrv_file = { 
    .bdrv_close         = raw_close,

    .bdrv_co_create_opts = raw_co_create_opts,

    .bdrv_has_zero_init = bdrv_has_zero_init_1,

    .bdrv_has_zero_init_truncate = bdrv_has_zero_init_1,



    .bdrv_aio_preadv    = raw_aio_preadv,

    .bdrv_aio_pwritev   = raw_aio_pwritev,