Commit 156d3203 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-08-19' into staging 



Block patches:
- preallocation=falloc/full support for LUKS
- Various minor fixes

# gpg: Signature made Mon 19 Aug 2019 16:36:45 BST
# gpg:                using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
# gpg:                issuer "mreitz@redhat.com"
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full]
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/maxreitz/tags/pull-block-2019-08-19:
  doc: Preallocation does not require writing zeroes
  iotests: Fix 141 when run with qed
  vpc: Do not return RAW from block_status
  vmdk: Make block_status recurse for flat extents
  vdi: Make block_status recurse for fixed images
  iotests: Full mirror to existing non-zero image
  iotests: Test convert -n to pre-filled image
  iotests: Convert to preallocated encrypted qcow2
  vhdx: Fix .bdrv_has_zero_init()
  vdi: Fix .bdrv_has_zero_init()
  qcow2: Fix .bdrv_has_zero_init()
  block: Use bdrv_has_zero_init_truncate()
  block: Implement .bdrv_has_zero_init_truncate()
  block: Add bdrv_has_zero_init_truncate()
  mirror: Fix bdrv_has_zero_init() use
  qemu-img: Fix bdrv_has_zero_init() use in convert
  LUKS: support preallocation

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 68945763 fa27c478

block.c

+21 −0
Original line number Diff line number Diff line
@@ -5078,6 +5078,27 @@ 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/crypto.c

+27 −3
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ static ssize_t block_crypto_read_func(QCryptoBlock *block, 
struct BlockCryptoCreateData {

    BlockBackend *blk;

    uint64_t size;

    PreallocMode prealloc;

};
@@ -112,7 +113,7 @@ static ssize_t block_crypto_init_func(QCryptoBlock *block, 
     * available to the guest, so we must take account of that

     * which will be used by the crypto header

     */

    return blk_truncate(data->blk, data->size + headerlen, PREALLOC_MODE_OFF,

    return blk_truncate(data->blk, data->size + headerlen, data->prealloc,

                        errp);

}
@@ -251,6 +252,7 @@ static int block_crypto_open_generic(QCryptoBlockFormat format, 
static int block_crypto_co_create_generic(BlockDriverState *bs,

                                          int64_t size,

                                          QCryptoBlockCreateOptions *opts,

                                          PreallocMode prealloc,

                                          Error **errp)

{

    int ret;
@@ -266,9 +268,14 @@ static int block_crypto_co_create_generic(BlockDriverState *bs, 
        goto cleanup;

    }



    if (prealloc == PREALLOC_MODE_METADATA) {

        prealloc = PREALLOC_MODE_OFF;

    }



    data = (struct BlockCryptoCreateData) {

        .blk = blk,

        .size = size,

        .prealloc = prealloc,

    };



    crypto = qcrypto_block_create(opts, NULL,
@@ -500,6 +507,7 @@ block_crypto_co_create_luks(BlockdevCreateOptions *create_options, Error **errp) 
    BlockdevCreateOptionsLUKS *luks_opts;

    BlockDriverState *bs = NULL;

    QCryptoBlockCreateOptions create_opts;

    PreallocMode preallocation = PREALLOC_MODE_OFF;

    int ret;



    assert(create_options->driver == BLOCKDEV_DRIVER_LUKS);
@@ -515,8 +523,12 @@ block_crypto_co_create_luks(BlockdevCreateOptions *create_options, Error **errp) 
        .u.luks = *qapi_BlockdevCreateOptionsLUKS_base(luks_opts),

    };



    if (luks_opts->has_preallocation) {

        preallocation = luks_opts->preallocation;

    }



    ret = block_crypto_co_create_generic(bs, luks_opts->size, &create_opts,

                                         errp);

                                         preallocation, errp);

    if (ret < 0) {

        goto fail;

    }
@@ -534,12 +546,24 @@ static int coroutine_fn block_crypto_co_create_opts_luks(const char *filename, 
    QCryptoBlockCreateOptions *create_opts = NULL;

    BlockDriverState *bs = NULL;

    QDict *cryptoopts;

    PreallocMode prealloc;

    char *buf = NULL;

    int64_t size;

    int ret;

    Error *local_err = NULL;



    /* Parse options */

    size = qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0);



    buf = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);

    prealloc = qapi_enum_parse(&PreallocMode_lookup, buf,

                               PREALLOC_MODE_OFF, &local_err);

    g_free(buf);

    if (local_err) {

        error_propagate(errp, local_err);

        return -EINVAL;

    }



    cryptoopts = qemu_opts_to_qdict_filtered(opts, NULL,

                                             &block_crypto_create_opts_luks,

                                             true);
@@ -565,7 +589,7 @@ static int coroutine_fn block_crypto_co_create_opts_luks(const char *filename, 
    }



    /* Create format layer */

    ret = block_crypto_co_create_generic(bs, size, create_opts, errp);

    ret = block_crypto_co_create_generic(bs, size, create_opts, prealloc, errp);

    if (ret < 0) {

        goto fail;

    }

block/file-posix.c

+1 −0
Original line number Diff line number Diff line
@@ -2938,6 +2938,7 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -635,6 +635,7 @@ 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,

block/gluster.c

+4 −0
Original line number Diff line number Diff line
@@ -1567,6 +1567,7 @@ static BlockDriver bdrv_gluster = { 
    .bdrv_co_writev               = qemu_gluster_co_writev,

    .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,

    .bdrv_has_zero_init           = qemu_gluster_has_zero_init,

    .bdrv_has_zero_init_truncate  = qemu_gluster_has_zero_init,

#ifdef CONFIG_GLUSTERFS_DISCARD

    .bdrv_co_pdiscard             = qemu_gluster_co_pdiscard,

#endif
@@ -1598,6 +1599,7 @@ static BlockDriver bdrv_gluster_tcp = { 
    .bdrv_co_writev               = qemu_gluster_co_writev,

    .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,

    .bdrv_has_zero_init           = qemu_gluster_has_zero_init,

    .bdrv_has_zero_init_truncate  = qemu_gluster_has_zero_init,

#ifdef CONFIG_GLUSTERFS_DISCARD

    .bdrv_co_pdiscard             = qemu_gluster_co_pdiscard,

#endif
@@ -1629,6 +1631,7 @@ static BlockDriver bdrv_gluster_unix = { 
    .bdrv_co_writev               = qemu_gluster_co_writev,

    .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,

    .bdrv_has_zero_init           = qemu_gluster_has_zero_init,

    .bdrv_has_zero_init_truncate  = qemu_gluster_has_zero_init,

#ifdef CONFIG_GLUSTERFS_DISCARD

    .bdrv_co_pdiscard             = qemu_gluster_co_pdiscard,

#endif
@@ -1666,6 +1669,7 @@ static BlockDriver bdrv_gluster_rdma = { 
    .bdrv_co_writev               = qemu_gluster_co_writev,

    .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,

    .bdrv_has_zero_init           = qemu_gluster_has_zero_init,

    .bdrv_has_zero_init_truncate  = qemu_gluster_has_zero_init,

#ifdef CONFIG_GLUSTERFS_DISCARD

    .bdrv_co_pdiscard             = qemu_gluster_co_pdiscard,

#endif