Commit 1bedcaf1 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

luks: Support .bdrv_co_create 



This adds the .bdrv_co_create driver callback to luks, which enables
image creation over QMP.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
parent 1ec4f416

block/crypto.c

+34 −0
Original line number Diff line number Diff line
@@ -543,6 +543,39 @@ static int block_crypto_open_luks(BlockDriverState *bs, 
                                     bs, options, flags, errp);

}



static int coroutine_fn

block_crypto_co_create_luks(BlockdevCreateOptions *create_options, Error **errp)

{

    BlockdevCreateOptionsLUKS *luks_opts;

    BlockDriverState *bs = NULL;

    QCryptoBlockCreateOptions create_opts;

    int ret;



    assert(create_options->driver == BLOCKDEV_DRIVER_LUKS);

    luks_opts = &create_options->u.luks;



    bs = bdrv_open_blockdev_ref(luks_opts->file, errp);

    if (bs == NULL) {

        return -EIO;

    }



    create_opts = (QCryptoBlockCreateOptions) {

        .format = Q_CRYPTO_BLOCK_FORMAT_LUKS,

        .u.luks = *qapi_BlockdevCreateOptionsLUKS_base(luks_opts),

    };



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

                                         errp);

    if (ret < 0) {

        goto fail;

    }



    ret = 0;

fail:

    bdrv_unref(bs);

    return ret;

}



static int coroutine_fn block_crypto_co_create_opts_luks(const char *filename,

                                                         QemuOpts *opts,

                                                         Error **errp)
@@ -647,6 +680,7 @@ BlockDriver bdrv_crypto_luks = { 
    .bdrv_open          = block_crypto_open_luks,

    .bdrv_close         = block_crypto_close,

    .bdrv_child_perm    = bdrv_format_default_perms,

    .bdrv_co_create     = block_crypto_co_create_luks,

    .bdrv_co_create_opts = block_crypto_co_create_opts_luks,

    .bdrv_truncate      = block_crypto_truncate,

    .create_opts        = &block_crypto_create_opts_luks,

qapi/block-core.json

+16 −1
Original line number Diff line number Diff line
@@ -3598,6 +3598,21 @@ 
            'size':             'size',

            '*preallocation':   'PreallocMode' } }



##

# @BlockdevCreateOptionsLUKS:

#

# Driver specific image creation options for LUKS.

#

# @file             Node to create the image format on

# @size             Size of the virtual disk in bytes

#

# Since: 2.12

##

{ 'struct': 'BlockdevCreateOptionsLUKS',

  'base': 'QCryptoBlockCreateOptionsLUKS',

  'data': { 'file':             'BlockdevRef',

            'size':             'size' } }



##

# @BlockdevCreateOptionsNfs:

#
@@ -3790,7 +3805,7 @@ 
      'http':           'BlockdevCreateNotSupported',

      'https':          'BlockdevCreateNotSupported',

      'iscsi':          'BlockdevCreateNotSupported',

      'luks':           'BlockdevCreateNotSupported',

      'luks':           'BlockdevCreateOptionsLUKS',

      'nbd':            'BlockdevCreateNotSupported',

      'nfs':            'BlockdevCreateOptionsNfs',

      'null-aio':       'BlockdevCreateNotSupported',