Commit 4906da7e authored by Kevin Wolf's avatar Kevin Wolf
Browse files

ssh: Support .bdrv_co_create 



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

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent 375f0b92

block/ssh.c

+48 −35
Original line number Diff line number Diff line
@@ -854,59 +854,71 @@ static QemuOptsList ssh_create_opts = { 
    }

};



static int ssh_co_create(BlockdevCreateOptions *options, Error **errp)

{

    BlockdevCreateOptionsSsh *opts = &options->u.ssh;

    BDRVSSHState s;

    int ret;



    assert(options->driver == BLOCKDEV_DRIVER_SSH);



    ssh_state_init(&s);



    ret = connect_to_ssh(&s, opts->location,

                         LIBSSH2_FXF_READ|LIBSSH2_FXF_WRITE|

                         LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC,

                         0644, errp);

    if (ret < 0) {

        goto fail;

    }



    if (opts->size > 0) {

        ret = ssh_grow_file(&s, opts->size, errp);

        if (ret < 0) {

            goto fail;

        }

    }



    ret = 0;

fail:

    ssh_state_free(&s);

    return ret;

}



static int coroutine_fn ssh_co_create_opts(const char *filename, QemuOpts *opts,

                                           Error **errp)

{

    int r, ret;

    int64_t total_size = 0;

    BlockdevCreateOptions *create_options;

    BlockdevCreateOptionsSsh *ssh_opts;

    int ret;

    QDict *uri_options = NULL;

    BlockdevOptionsSsh *ssh_opts = NULL;

    BDRVSSHState s;



    ssh_state_init(&s);

    create_options = g_new0(BlockdevCreateOptions, 1);

    create_options->driver = BLOCKDEV_DRIVER_SSH;

    ssh_opts = &create_options->u.ssh;



    /* Get desired file size. */

    total_size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),

    ssh_opts->size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),

                              BDRV_SECTOR_SIZE);

    DPRINTF("total_size=%" PRIi64, total_size);

    DPRINTF("total_size=%" PRIi64, ssh_opts->size);



    uri_options = qdict_new();

    r = parse_uri(filename, uri_options, errp);

    if (r < 0) {

        ret = r;

    ret = parse_uri(filename, uri_options, errp);

    if (ret < 0) {

        goto out;

    }



    ssh_opts = ssh_parse_options(uri_options, errp);

    if (ssh_opts == NULL) {

    ssh_opts->location = ssh_parse_options(uri_options, errp);

    if (ssh_opts->location == NULL) {

        ret = -EINVAL;

        goto out;

    }



    r = connect_to_ssh(&s, ssh_opts,

                       LIBSSH2_FXF_READ|LIBSSH2_FXF_WRITE|

                       LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC,

                       0644, errp);

    if (r < 0) {

        ret = r;

        goto out;

    }



    if (total_size > 0) {

        ret = ssh_grow_file(&s, total_size, errp);

        if (ret < 0) {

            goto out;

        }

    }



    ret = 0;

    ret = ssh_co_create(create_options, errp);



 out:

    ssh_state_free(&s);

    if (uri_options != NULL) {

    QDECREF(uri_options);

    }

    qapi_free_BlockdevOptionsSsh(ssh_opts);

    qapi_free_BlockdevCreateOptions(create_options);

    return ret;

}
@@ -1268,6 +1280,7 @@ static BlockDriver bdrv_ssh = { 
    .instance_size                = sizeof(BDRVSSHState),

    .bdrv_parse_filename          = ssh_parse_filename,

    .bdrv_file_open               = ssh_file_open,

    .bdrv_co_create               = ssh_co_create,

    .bdrv_co_create_opts          = ssh_co_create_opts,

    .bdrv_close                   = ssh_close,

    .bdrv_has_zero_init           = ssh_has_zero_init,

qapi/block-core.json

+15 −1
Original line number Diff line number Diff line
@@ -3592,6 +3592,20 @@ 
            '*redundancy':      'SheepdogRedundancy',

            '*object-size':     'size' } }



##

# @BlockdevCreateOptionsSsh:

#

# Driver specific image creation options for SSH.

#

# @location         Where to store the new image file

# @size             Size of the virtual disk in bytes

#

# Since: 2.12

##

{ 'struct': 'BlockdevCreateOptionsSsh',

  'data': { 'location':         'BlockdevOptionsSsh',

            'size':             'size' } }



##

# @BlockdevCreateNotSupported:

#
@@ -3644,7 +3658,7 @@ 
      'rbd':            'BlockdevCreateOptionsRbd',

      'replication':    'BlockdevCreateNotSupported',

      'sheepdog':       'BlockdevCreateOptionsSheepdog',

      'ssh':            'BlockdevCreateNotSupported',

      'ssh':            'BlockdevCreateOptionsSsh',

      'throttle':       'BlockdevCreateNotSupported',

      'vdi':            'BlockdevCreateNotSupported',

      'vhdx':           'BlockdevCreateNotSupported',