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

cow.c: replace QEMUOptionParameter with QemuOpts

Browse Source 
Reviewed-by: Eric Blake <eblake@redhat.com>
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:20:53 +08:00 committed by Stefan Hajnoczi
parent facdbb0272
commit 25814e8987
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
block/cow.c
View File

@ -324,31 +324,24 @@ static void cow_close(BlockDriverState *bs)
{ {
} }
static int cow_create(const char *filename, QEMUOptionParameter *options, static int cow_create(const char *filename, QemuOpts *opts, Error **errp)
Error **errp)
{ {
struct cow_header_v2 cow_header; struct cow_header_v2 cow_header;
struct stat st; struct stat st;
int64_t image_sectors = 0; int64_t image_sectors = 0;
const char *image_filename = NULL; char *image_filename = NULL;
Error *local_err = NULL; Error *local_err = NULL;
int ret; int ret;
BlockDriverState *cow_bs; BlockDriverState *cow_bs;
/* Read out options */ /* Read out options */
while (options && options->name) { image_sectors = qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / 512;
if (!strcmp(options->name, BLOCK_OPT_SIZE)) { image_filename = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FILE);
image_sectors = options->value.n / 512;
} else if (!strcmp(options->name, BLOCK_OPT_BACKING_FILE)) {
image_filename = options->value.s;
}
options++;
}
ret = bdrv_create_file(filename, options, NULL, &local_err); ret = bdrv_create_file(filename, NULL, opts, &local_err);
if (ret < 0) { if (ret < 0) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
return ret; goto exit;
} }
cow_bs = NULL; cow_bs = NULL;
@ -356,7 +349,7 @@ static int cow_create(const char *filename, QEMUOptionParameter *options,
BDRV_O_RDWR | BDRV_O_PROTOCOL, NULL, &local_err); BDRV_O_RDWR | BDRV_O_PROTOCOL, NULL, &local_err);
if (ret < 0) { if (ret < 0) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
return ret; goto exit;
} }
memset(&cow_header, 0, sizeof(cow_header)); memset(&cow_header, 0, sizeof(cow_header));
@ -389,22 +382,27 @@ static int cow_create(const char *filename, QEMUOptionParameter *options,
} }
exit: exit:
g_free(image_filename);
bdrv_unref(cow_bs); bdrv_unref(cow_bs);
return ret; return ret;
} }
static QEMUOptionParameter cow_create_options[] = { static QemuOptsList cow_create_opts = {
{ .name = "cow-create-opts",
.name = BLOCK_OPT_SIZE, .head = QTAILQ_HEAD_INITIALIZER(cow_create_opts.head),
.type = OPT_SIZE, .desc = {
.help = "Virtual disk size" {
}, .name = BLOCK_OPT_SIZE,
{ .type = QEMU_OPT_SIZE,
.name = BLOCK_OPT_BACKING_FILE, .help = "Virtual disk size"
.type = OPT_STRING, },
.help = "File name of a base image" {
}, .name = BLOCK_OPT_BACKING_FILE,
{ NULL } .type = QEMU_OPT_STRING,
.help = "File name of a base image"
},
{ /* end of list */ }
}
}; };
static BlockDriver bdrv_cow = { static BlockDriver bdrv_cow = {
@ -414,14 +412,14 @@ static BlockDriver bdrv_cow = {
.bdrv_probe = cow_probe, .bdrv_probe = cow_probe,
.bdrv_open = cow_open, .bdrv_open = cow_open,
.bdrv_close = cow_close, .bdrv_close = cow_close,
.bdrv_create = cow_create, .bdrv_create2 = cow_create,
.bdrv_has_zero_init = bdrv_has_zero_init_1, .bdrv_has_zero_init = bdrv_has_zero_init_1,
.bdrv_read = cow_co_read, .bdrv_read = cow_co_read,
.bdrv_write = cow_co_write, .bdrv_write = cow_co_write,
.bdrv_co_get_block_status = cow_co_get_block_status, .bdrv_co_get_block_status = cow_co_get_block_status,
.create_options = cow_create_options, .create_opts = &cow_create_opts,
}; };
static void bdrv_cow_init(void) static void bdrv_cow_init(void)