Commit 766181fe authored by Chunyan Liu's avatar Chunyan Liu Committed by Stefan Hajnoczi
Browse files

ssh.c: replace QEMUOptionParameter with QemuOpts 



Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarDong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: default avatarChunyan Liu <cyliu@suse.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent b222237b

block/ssh.c

+15 −17
Original line number Diff line number Diff line
@@ -675,17 +675,20 @@ static int ssh_file_open(BlockDriverState *bs, QDict *options, int bdrv_flags, 
    return ret;

}



static QEMUOptionParameter ssh_create_options[] = {

static QemuOptsList ssh_create_opts = {

    .name = "ssh-create-opts",

    .head = QTAILQ_HEAD_INITIALIZER(ssh_create_opts.head),

    .desc = {

        {

            .name = BLOCK_OPT_SIZE,

        .type = OPT_SIZE,

            .type = QEMU_OPT_SIZE,

            .help = "Virtual disk size"

        },

    { NULL }

        { /* end of list */ }

    }

};



static int ssh_create(const char *filename, QEMUOptionParameter *options,

                      Error **errp)

static int ssh_create(const char *filename, QemuOpts *opts, Error **errp)

{

    int r, ret;

    int64_t total_size = 0;
@@ -697,12 +700,7 @@ static int ssh_create(const char *filename, QEMUOptionParameter *options, 
    ssh_state_init(&s);



    /* Get desired file size. */

    while (options && options->name) {

        if (!strcmp(options->name, BLOCK_OPT_SIZE)) {

            total_size = options->value.n;

        }

        options++;

    }

    total_size = qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0);

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



    uri_options = qdict_new();
@@ -1077,14 +1075,14 @@ static BlockDriver bdrv_ssh = { 
    .instance_size                = sizeof(BDRVSSHState),

    .bdrv_parse_filename          = ssh_parse_filename,

    .bdrv_file_open               = ssh_file_open,

    .bdrv_create                  = ssh_create,

    .bdrv_create2                 = ssh_create,

    .bdrv_close                   = ssh_close,

    .bdrv_has_zero_init           = ssh_has_zero_init,

    .bdrv_co_readv                = ssh_co_readv,

    .bdrv_co_writev               = ssh_co_writev,

    .bdrv_getlength               = ssh_getlength,

    .bdrv_co_flush_to_disk        = ssh_co_flush,

    .create_options               = ssh_create_options,

    .create_opts                  = &ssh_create_opts,

};



static void bdrv_ssh_init(void)