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

raw-posix.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 7ab74849

block/raw-posix.c

+27 −32
Original line number Diff line number Diff line
@@ -1273,8 +1273,7 @@ static int64_t raw_get_allocated_file_size(BlockDriverState *bs) 
    return (int64_t)st.st_blocks * 512;

}



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

                      Error **errp)

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

{

    int fd;

    int result = 0;
@@ -1283,12 +1282,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 / BDRV_SECTOR_SIZE;

        }

        options++;

    }

    total_size =

        qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / BDRV_SECTOR_SIZE;



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

                   0644);
@@ -1473,13 +1468,17 @@ static int raw_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) 
    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 = {
@@ -1494,7 +1493,7 @@ static BlockDriver bdrv_file = { 
    .bdrv_reopen_commit = raw_reopen_commit,

    .bdrv_reopen_abort = raw_reopen_abort,

    .bdrv_close = raw_close,

    .bdrv_create = raw_create,

    .bdrv_create2 = raw_create,

    .bdrv_has_zero_init = bdrv_has_zero_init_1,

    .bdrv_co_get_block_status = raw_co_get_block_status,

    .bdrv_co_write_zeroes = raw_co_write_zeroes,
@@ -1514,7 +1513,7 @@ static BlockDriver bdrv_file = { 
    .bdrv_detach_aio_context = raw_detach_aio_context,

    .bdrv_attach_aio_context = raw_attach_aio_context,



    .create_options = raw_create_options,

    .create_opts = &raw_create_opts,

};



/***********************************************/
@@ -1835,7 +1834,7 @@ static coroutine_fn int hdev_co_write_zeroes(BlockDriverState *bs, 
    return -ENOTSUP;

}



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

static int hdev_create(const char *filename, QemuOpts *opts,

                       Error **errp)

{

    int fd;
@@ -1856,12 +1855,8 @@ static int hdev_create(const char *filename, QEMUOptionParameter *options, 
    (void)has_prefix;



    /* Read out options */

    while (options && options->name) {

        if (!strcmp(options->name, "size")) {

            total_size = options->value.n / BDRV_SECTOR_SIZE;

        }

        options++;

    }

    total_size =

        qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / BDRV_SECTOR_SIZE;



    fd = qemu_open(filename, O_WRONLY | O_BINARY);

    if (fd < 0) {
@@ -1898,8 +1893,8 @@ static BlockDriver bdrv_host_device = { 
    .bdrv_reopen_prepare = raw_reopen_prepare,

    .bdrv_reopen_commit  = raw_reopen_commit,

    .bdrv_reopen_abort   = raw_reopen_abort,

    .bdrv_create        = hdev_create,

    .create_options     = raw_create_options,

    .bdrv_create2        = hdev_create,

    .create_opts         = &raw_create_opts,

    .bdrv_co_write_zeroes = hdev_co_write_zeroes,



    .bdrv_aio_readv	= raw_aio_readv,
@@ -2045,8 +2040,8 @@ static BlockDriver bdrv_host_floppy = { 
    .bdrv_reopen_prepare = raw_reopen_prepare,

    .bdrv_reopen_commit  = raw_reopen_commit,

    .bdrv_reopen_abort   = raw_reopen_abort,

    .bdrv_create        = hdev_create,

    .create_options     = raw_create_options,

    .bdrv_create2        = hdev_create,

    .create_opts         = &raw_create_opts,



    .bdrv_aio_readv     = raw_aio_readv,

    .bdrv_aio_writev    = raw_aio_writev,
@@ -2173,8 +2168,8 @@ static BlockDriver bdrv_host_cdrom = { 
    .bdrv_reopen_prepare = raw_reopen_prepare,

    .bdrv_reopen_commit  = raw_reopen_commit,

    .bdrv_reopen_abort   = raw_reopen_abort,

    .bdrv_create        = hdev_create,

    .create_options     = raw_create_options,

    .bdrv_create2        = hdev_create,

    .create_opts         = &raw_create_opts,



    .bdrv_aio_readv     = raw_aio_readv,

    .bdrv_aio_writev    = raw_aio_writev,
@@ -2307,8 +2302,8 @@ static BlockDriver bdrv_host_cdrom = { 
    .bdrv_reopen_prepare = raw_reopen_prepare,

    .bdrv_reopen_commit  = raw_reopen_commit,

    .bdrv_reopen_abort   = raw_reopen_abort,

    .bdrv_create        = hdev_create,

    .create_options     = raw_create_options,

    .bdrv_create2        = hdev_create,

    .create_opts        = &raw_create_opts,



    .bdrv_aio_readv     = raw_aio_readv,

    .bdrv_aio_writev    = raw_aio_writev,