Commit 29ca9e45 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

qcow2: Pass BlockdevCreateOptions to qcow2_co_create() 



All of the simple options are now passed to qcow2_co_create() in a
BlockdevCreateOptions object. Still missing: node-name and the
encryption options.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent cbf2b7c4

block/qcow2.c

+151 −38
Original line number Diff line number Diff line
@@ -2700,19 +2700,26 @@ static int64_t qcow2_calc_prealloc_size(int64_t total_size, 
    return meta_size + aligned_total_size;

}



static size_t qcow2_opt_get_cluster_size_del(QemuOpts *opts, Error **errp)

static bool validate_cluster_size(size_t cluster_size, Error **errp)

{

    size_t cluster_size;

    int cluster_bits;



    cluster_size = qemu_opt_get_size_del(opts, BLOCK_OPT_CLUSTER_SIZE,

                                         DEFAULT_CLUSTER_SIZE);

    cluster_bits = ctz32(cluster_size);

    int cluster_bits = ctz32(cluster_size);

    if (cluster_bits < MIN_CLUSTER_BITS || cluster_bits > MAX_CLUSTER_BITS ||

        (1 << cluster_bits) != cluster_size)

    {

        error_setg(errp, "Cluster size must be a power of two between %d and "

                   "%dk", 1 << MIN_CLUSTER_BITS, 1 << (MAX_CLUSTER_BITS - 10));

        return false;

    }

    return true;

}



static size_t qcow2_opt_get_cluster_size_del(QemuOpts *opts, Error **errp)

{

    size_t cluster_size;



    cluster_size = qemu_opt_get_size_del(opts, BLOCK_OPT_CLUSTER_SIZE,

                                         DEFAULT_CLUSTER_SIZE);

    if (!validate_cluster_size(cluster_size, errp)) {

        return 0;

    }

    return cluster_size;
@@ -2761,12 +2768,10 @@ static uint64_t qcow2_opt_get_refcount_bits_del(QemuOpts *opts, int version, 
}



static int coroutine_fn

qcow2_co_create(BlockDriverState *bs, int64_t total_size,

                const char *backing_file, const char *backing_format,

                int flags, size_t cluster_size, PreallocMode prealloc,

                QemuOpts *opts, int version, int refcount_order,

                const char *encryptfmt, Error **errp)

qcow2_co_create(BlockDriverState *bs, BlockdevCreateOptions *create_options,

                QemuOpts *opts, const char *encryptfmt, Error **errp)

{

    BlockdevCreateOptionsQcow2 *qcow2_opts;

    QDict *options;



    /*
@@ -2783,10 +2788,92 @@ qcow2_co_create(BlockDriverState *bs, int64_t total_size, 
     */

    BlockBackend *blk;

    QCowHeader *header;

    size_t cluster_size;

    int version;

    int refcount_order;

    uint64_t* refcount_table;

    Error *local_err = NULL;

    int ret;



    /* Validate options and set default values */

    assert(create_options->driver == BLOCKDEV_DRIVER_QCOW2);

    qcow2_opts = &create_options->u.qcow2;



    if (!QEMU_IS_ALIGNED(qcow2_opts->size, BDRV_SECTOR_SIZE)) {

        error_setg(errp, "Image size must be a multiple of 512 bytes");

        ret = -EINVAL;

        goto out;

    }



    if (qcow2_opts->has_version) {

        switch (qcow2_opts->version) {

        case BLOCKDEV_QCOW2_VERSION_V2:

            version = 2;

            break;

        case BLOCKDEV_QCOW2_VERSION_V3:

            version = 3;

            break;

        default:

            g_assert_not_reached();

        }

    } else {

        version = 3;

    }



    if (qcow2_opts->has_cluster_size) {

        cluster_size = qcow2_opts->cluster_size;

    } else {

        cluster_size = DEFAULT_CLUSTER_SIZE;

    }



    if (!validate_cluster_size(cluster_size, errp)) {

        return -EINVAL;

    }



    if (!qcow2_opts->has_preallocation) {

        qcow2_opts->preallocation = PREALLOC_MODE_OFF;

    }

    if (qcow2_opts->has_backing_file &&

        qcow2_opts->preallocation != PREALLOC_MODE_OFF)

    {

        error_setg(errp, "Backing file and preallocation cannot be used at "

                   "the same time");

        return -EINVAL;

    }

    if (qcow2_opts->has_backing_fmt && !qcow2_opts->has_backing_file) {

        error_setg(errp, "Backing format cannot be used without backing file");

        return -EINVAL;

    }



    if (!qcow2_opts->has_lazy_refcounts) {

        qcow2_opts->lazy_refcounts = false;

    }

    if (version < 3 && qcow2_opts->lazy_refcounts) {

        error_setg(errp, "Lazy refcounts only supported with compatibility "

                   "level 1.1 and above (use compat=1.1 or greater)");

        return -EINVAL;

    }



    if (!qcow2_opts->has_refcount_bits) {

        qcow2_opts->refcount_bits = 16;

    }

    if (qcow2_opts->refcount_bits > 64 ||

        !is_power_of_2(qcow2_opts->refcount_bits))

    {

        error_setg(errp, "Refcount width must be a power of two and may not "

                   "exceed 64 bits");

        return -EINVAL;

    }

    if (version < 3 && qcow2_opts->refcount_bits != 16) {

        error_setg(errp, "Different refcount widths than 16 bits require "

                   "compatibility level 1.1 or above (use compat=1.1 or "

                   "greater)");

        return -EINVAL;

    }

    refcount_order = ctz32(qcow2_opts->refcount_bits);





    /* Create BlockBackend to write to the image */

    blk = blk_new(BLK_PERM_WRITE | BLK_PERM_RESIZE, BLK_PERM_ALL);

    ret = blk_insert_bs(blk, bs, errp);

    if (ret < 0) {
@@ -2813,7 +2900,7 @@ qcow2_co_create(BlockDriverState *bs, int64_t total_size, 
    /* We'll update this to correct value later */

    header->crypt_method = cpu_to_be32(QCOW_CRYPT_NONE);



    if (flags & BLOCK_FLAG_LAZY_REFCOUNTS) {

    if (qcow2_opts->lazy_refcounts) {

        header->compatible_features |=

            cpu_to_be64(QCOW2_COMPAT_LAZY_REFCOUNTS);

    }
@@ -2875,18 +2962,26 @@ qcow2_co_create(BlockDriverState *bs, int64_t total_size, 
    }



    /* Okay, now that we have a valid image, let's give it the right size */

    ret = blk_truncate(blk, total_size, PREALLOC_MODE_OFF, errp);

    ret = blk_truncate(blk, qcow2_opts->size, PREALLOC_MODE_OFF, errp);

    if (ret < 0) {

        error_prepend(errp, "Could not resize image: ");

        goto out;

    }



    /* Want a backing file? There you go.*/

    if (backing_file) {

        ret = bdrv_change_backing_file(blk_bs(blk), backing_file, backing_format);

    if (qcow2_opts->has_backing_file) {

        const char *backing_format = NULL;



        if (qcow2_opts->has_backing_fmt) {

            backing_format = BlockdevDriver_str(qcow2_opts->backing_fmt);

        }



        ret = bdrv_change_backing_file(blk_bs(blk), qcow2_opts->backing_file,

                                       backing_format);

        if (ret < 0) {

            error_setg_errno(errp, -ret, "Could not assign backing file '%s' "

                             "with format '%s'", backing_file, backing_format);

                             "with format '%s'", qcow2_opts->backing_file,

                             backing_format);

            goto out;

        }

    }
@@ -2900,8 +2995,8 @@ qcow2_co_create(BlockDriverState *bs, int64_t total_size, 
    }



    /* And if we're supposed to preallocate metadata, do that now */

    if (prealloc != PREALLOC_MODE_OFF) {

        ret = preallocate(blk_bs(blk), 0, total_size);

    if (qcow2_opts->preallocation != PREALLOC_MODE_OFF) {

        ret = preallocate(blk_bs(blk), 0, qcow2_opts->size);

        if (ret < 0) {

            error_setg_errno(errp, -ret, "Could not preallocate metadata");

            goto out;
@@ -2940,8 +3035,10 @@ out: 
static int coroutine_fn qcow2_co_create_opts(const char *filename, QemuOpts *opts,

                                             Error **errp)

{

    BlockdevCreateOptions create_options;

    char *backing_file = NULL;

    char *backing_fmt = NULL;

    BlockdevDriver backing_drv;

    char *buf = NULL;

    uint64_t size = 0;

    int flags = 0;
@@ -2949,7 +3046,6 @@ static int coroutine_fn qcow2_co_create_opts(const char *filename, QemuOpts *opt 
    PreallocMode prealloc;

    int version;

    uint64_t refcount_bits;

    int refcount_order;

    char *encryptfmt = NULL;

    BlockDriverState *bs = NULL;

    Error *local_err = NULL;
@@ -2960,6 +3056,13 @@ static int coroutine_fn qcow2_co_create_opts(const char *filename, QemuOpts *opt 
                    BDRV_SECTOR_SIZE);

    backing_file = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FILE);

    backing_fmt = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FMT);

    backing_drv = qapi_enum_parse(&BlockdevDriver_lookup, backing_fmt,

                                  0, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        ret = -EINVAL;

        goto finish;

    }

    encryptfmt = qemu_opt_get_del(opts, BLOCK_OPT_ENCRYPT_FORMAT);

    if (encryptfmt) {

        if (qemu_opt_get(opts, BLOCK_OPT_ENCRYPT)) {
@@ -2997,20 +3100,6 @@ static int coroutine_fn qcow2_co_create_opts(const char *filename, QemuOpts *opt 
        flags |= BLOCK_FLAG_LAZY_REFCOUNTS;

    }



    if (backing_file && prealloc != PREALLOC_MODE_OFF) {

        error_setg(errp, "Backing file and preallocation cannot be used at "

                   "the same time");

        ret = -EINVAL;

        goto finish;

    }



    if (version < 3 && (flags & BLOCK_FLAG_LAZY_REFCOUNTS)) {

        error_setg(errp, "Lazy refcounts only supported with compatibility "

                   "level 1.1 and above (use compat=1.1 or greater)");

        ret = -EINVAL;

        goto finish;

    }



    refcount_bits = qcow2_opt_get_refcount_bits_del(opts, version, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);
@@ -3018,10 +3107,10 @@ static int coroutine_fn qcow2_co_create_opts(const char *filename, QemuOpts *opt 
        goto finish;

    }



    refcount_order = ctz32(refcount_bits);



    /* Create and open the file (protocol layer) */

    if (prealloc == PREALLOC_MODE_FULL || prealloc == PREALLOC_MODE_FALLOC) {

        int refcount_order = ctz32(refcount_bits);

        int64_t prealloc_size =

            qcow2_calc_prealloc_size(size, cluster_size, refcount_order);

        qemu_opt_set_number(opts, BLOCK_OPT_SIZE, prealloc_size, &error_abort);
@@ -3042,9 +3131,33 @@ static int coroutine_fn qcow2_co_create_opts(const char *filename, QemuOpts *opt 
    }



    /* Create the qcow2 image (format layer) */

    ret = qcow2_co_create(bs, size, backing_file, backing_fmt, flags,

                          cluster_size, prealloc, opts, version, refcount_order,

                          encryptfmt, errp);

    create_options = (BlockdevCreateOptions) {

        .driver         = BLOCKDEV_DRIVER_QCOW2,

        .u.qcow2        = {

            .file               = &(BlockdevRef) {

                .type               = QTYPE_QSTRING,

                .u.reference        = bs->node_name,

            },

            .size               = size,

            .has_version        = true,

            .version            = version == 2

                                  ? BLOCKDEV_QCOW2_VERSION_V2

                                  : BLOCKDEV_QCOW2_VERSION_V3,

            .has_backing_file   = (backing_file != NULL),

            .backing_file       = backing_file,

            .has_backing_fmt    = (backing_fmt != NULL),

            .backing_fmt        = backing_drv,

            .has_cluster_size   = true,

            .cluster_size       = cluster_size,

            .has_preallocation  = true,

            .preallocation      = prealloc,

            .has_lazy_refcounts = true,

            .lazy_refcounts     = (flags & BLOCK_FLAG_LAZY_REFCOUNTS),

            .has_refcount_bits  = true,

            .refcount_bits      = refcount_bits,

        },

    };

    ret = qcow2_co_create(bs, &create_options, opts, encryptfmt, errp);

    if (ret < 0) {

        goto finish;

    }