ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

raw_bsd.c: replace QEMUOptionParameter with QemuOpts 

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Chunyan Liu 2014-06-05 17:21:03 +08:00 committed by Stefan Hajnoczi
parent ddef769993
commit cd3a4cf631
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
block/raw_bsd.c
View File

@ -29,13 +29,17 @@
#include "block/block_int.h" #include "block/block_int.h"
#include "qemu/option.h" #include "qemu/option.h"
static QEMUOptionParameter raw_create_options[] = { static QemuOptsList raw_create_opts = {
{ .name = "raw-create-opts",
.name = BLOCK_OPT_SIZE, .head = QTAILQ_HEAD_INITIALIZER(raw_create_opts.head),
.type = OPT_SIZE, .desc = {
.help = "Virtual disk size" {
}, .name = BLOCK_OPT_SIZE,
{ 0 } .type = QEMU_OPT_SIZE,
.help = "Virtual disk size"
},
{ /* end of list */ }
}
}; };
static int raw_reopen_prepare(BDRVReopenState *reopen_state, static int raw_reopen_prepare(BDRVReopenState *reopen_state,
@ -139,13 +143,12 @@ static int raw_has_zero_init(BlockDriverState *bs)
return bdrv_has_zero_init(bs->file); return bdrv_has_zero_init(bs->file);
} }
static int raw_create(const char *filename, QEMUOptionParameter *options, static int raw_create(const char *filename, QemuOpts *opts, Error **errp)
Error **errp)
{ {
Error *local_err = NULL; Error *local_err = NULL;
int ret; int ret;
ret = bdrv_create_file(filename, options, NULL, &local_err); ret = bdrv_create_file(filename, NULL, opts, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
} }
@ -177,7 +180,7 @@ static BlockDriver bdrv_raw = {
.bdrv_reopen_prepare = &raw_reopen_prepare, .bdrv_reopen_prepare = &raw_reopen_prepare,
.bdrv_open = &raw_open, .bdrv_open = &raw_open,
.bdrv_close = &raw_close, .bdrv_close = &raw_close,
.bdrv_create = &raw_create, .bdrv_create2 = &raw_create,
.bdrv_co_readv = &raw_co_readv, .bdrv_co_readv = &raw_co_readv,
.bdrv_co_writev = &raw_co_writev, .bdrv_co_writev = &raw_co_writev,
.bdrv_co_write_zeroes = &raw_co_write_zeroes, .bdrv_co_write_zeroes = &raw_co_write_zeroes,
@ -194,7 +197,7 @@ static BlockDriver bdrv_raw = {
.bdrv_lock_medium = &raw_lock_medium, .bdrv_lock_medium = &raw_lock_medium,
.bdrv_ioctl = &raw_ioctl, .bdrv_ioctl = &raw_ioctl,
.bdrv_aio_ioctl = &raw_aio_ioctl, .bdrv_aio_ioctl = &raw_aio_ioctl,
.create_options = &raw_create_options[0], .create_opts = &raw_create_opts,
.bdrv_has_zero_init = &raw_has_zero_init .bdrv_has_zero_init = &raw_has_zero_init
}; };