mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

raw-win32.c: replace QEMUOptionParameter with QemuOpts

Browse Source 
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:02 +08:00 committed by Stefan Hajnoczi
parent 6f482f742d
commit ddef769993
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
block/raw-win32.c
View File

@ -503,8 +503,7 @@ static int64_t raw_get_allocated_file_size(BlockDriverState *bs)
return st.st_size; return st.st_size;
} }
static int raw_create(const char *filename, QEMUOptionParameter *options, static int raw_create(const char *filename, QemuOpts *opts, Error **errp)
Error **errp)
{ {
int fd; int fd;
int64_t total_size = 0; int64_t total_size = 0;
@ -512,12 +511,8 @@ static int raw_create(const char *filename, QEMUOptionParameter *options,
strstart(filename, "file:", &filename); strstart(filename, "file:", &filename);
/* Read out options */ /* Read out options */
while (options && options->name) { total_size =
if (!strcmp(options->name, BLOCK_OPT_SIZE)) { qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / 512;
total_size = options->value.n / 512;
}
options++;
}
fd = qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, fd = qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,
0644); 0644);
@ -531,13 +526,18 @@ static int raw_create(const char *filename, QEMUOptionParameter *options,
return 0; return 0;
} }
static QEMUOptionParameter raw_create_options[] = {
{ static QemuOptsList raw_create_opts = {
.name = BLOCK_OPT_SIZE, .name = "raw-create-opts",
.type = OPT_SIZE, .head = QTAILQ_HEAD_INITIALIZER(raw_create_opts.head),
.help = "Virtual disk size" .desc = {
}, {
{ NULL } .name = BLOCK_OPT_SIZE,
.type = QEMU_OPT_SIZE,
.help = "Virtual disk size"
},
{ /* end of list */ }
}
}; };
static BlockDriver bdrv_file = { static BlockDriver bdrv_file = {
@ -546,9 +546,9 @@ static BlockDriver bdrv_file = {
.instance_size = sizeof(BDRVRawState), .instance_size = sizeof(BDRVRawState),
.bdrv_needs_filename = true, .bdrv_needs_filename = true,
.bdrv_parse_filename = raw_parse_filename, .bdrv_parse_filename = raw_parse_filename,
.bdrv_file_open = raw_open, .bdrv_file_open = raw_open,
.bdrv_close = raw_close, .bdrv_close = raw_close,
.bdrv_create = raw_create, .bdrv_create2 = raw_create,
.bdrv_has_zero_init = bdrv_has_zero_init_1, .bdrv_has_zero_init = bdrv_has_zero_init_1,
.bdrv_aio_readv = raw_aio_readv, .bdrv_aio_readv = raw_aio_readv,
@ -560,7 +560,7 @@ static BlockDriver bdrv_file = {
.bdrv_get_allocated_file_size .bdrv_get_allocated_file_size
= raw_get_allocated_file_size, = raw_get_allocated_file_size,
.create_options = raw_create_options, .create_opts = &raw_create_opts,
}; };
/***********************************************/ /***********************************************/