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

raw-win32.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 6f482f74

block/raw-win32.c

+19 −19
Original line number Diff line number Diff line
@@ -503,8 +503,7 @@ static int64_t raw_get_allocated_file_size(BlockDriverState *bs) 
    return st.st_size;

}



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

                      Error **errp)

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

{

    int fd;

    int64_t total_size = 0;
@@ -512,12 +511,8 @@ static int raw_create(const char *filename, QEMUOptionParameter *options, 
    strstart(filename, "file:", &filename);



    /* Read out options */

    while (options && options->name) {

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

            total_size = options->value.n / 512;

        }

        options++;

    }

    total_size =

        qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / 512;



    fd = qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,

                   0644);
@@ -531,13 +526,18 @@ static int raw_create(const char *filename, QEMUOptionParameter *options, 
    return 0;

}



static QEMUOptionParameter raw_create_options[] = {



static QemuOptsList raw_create_opts = {

    .name = "raw-create-opts",

    .head = QTAILQ_HEAD_INITIALIZER(raw_create_opts.head),

    .desc = {

        {

            .name = BLOCK_OPT_SIZE,

        .type = OPT_SIZE,

            .type = QEMU_OPT_SIZE,

            .help = "Virtual disk size"

        },

    { NULL }

        { /* end of list */ }

    }

};



static BlockDriver bdrv_file = {
@@ -548,7 +548,7 @@ static BlockDriver bdrv_file = { 
    .bdrv_parse_filename = raw_parse_filename,

    .bdrv_file_open     = raw_open,

    .bdrv_close         = raw_close,

    .bdrv_create	= raw_create,

    .bdrv_create2       = raw_create,

    .bdrv_has_zero_init = bdrv_has_zero_init_1,



    .bdrv_aio_readv     = raw_aio_readv,
@@ -560,7 +560,7 @@ static BlockDriver bdrv_file = { 
    .bdrv_get_allocated_file_size

                        = raw_get_allocated_file_size,



    .create_options = raw_create_options,

    .create_opts        = &raw_create_opts,

};



/***********************************************/