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

sheepdog.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:05 +08:00 committed by Stefan Hajnoczi
parent bd0cf596fd
commit b222237b7b
1 changed files with 56 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
block/sheepdog.c
View File

@ -1670,12 +1670,13 @@ static int parse_redundancy(BDRVSheepdogState *s, const char *opt)
return 0; return 0;
} }
static int sd_create(const char *filename, QEMUOptionParameter *options, static int sd_create(const char *filename, QemuOpts *opts,
Error **errp) Error **errp)
{ {
int ret = 0; int ret = 0;
uint32_t vid = 0; uint32_t vid = 0;
char *backing_file = NULL; char *backing_file = NULL;
char *buf = NULL;
BDRVSheepdogState *s; BDRVSheepdogState *s;
char tag[SD_MAX_VDI_TAG_LEN]; char tag[SD_MAX_VDI_TAG_LEN];
uint32_t snapid; uint32_t snapid;
@ -1694,33 +1695,27 @@ static int sd_create(const char *filename, QEMUOptionParameter *options,
goto out; goto out;
} }
while (options && options->name) { s->inode.vdi_size = qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0);
if (!strcmp(options->name, BLOCK_OPT_SIZE)) { backing_file = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FILE);
s->inode.vdi_size = options->value.n; buf = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);
} else if (!strcmp(options->name, BLOCK_OPT_BACKING_FILE)) { if (!buf || !strcmp(buf, "off")) {
backing_file = options->value.s; prealloc = false;
} else if (!strcmp(options->name, BLOCK_OPT_PREALLOC)) { } else if (!strcmp(buf, "full")) {
if (!options->value.s || !strcmp(options->value.s, "off")) { prealloc = true;
prealloc = false; } else {
} else if (!strcmp(options->value.s, "full")) { error_setg(errp, "Invalid preallocation mode: '%s'", buf);
prealloc = true; ret = -EINVAL;
} else { goto out;
error_setg(errp, "Invalid preallocation mode: '%s'", }
options->value.s);
ret = -EINVAL; g_free(buf);
goto out; buf = qemu_opt_get_del(opts, BLOCK_OPT_REDUNDANCY);
} if (buf) {
} else if (!strcmp(options->name, BLOCK_OPT_REDUNDANCY)) { ret = parse_redundancy(s, buf);
if (options->value.s) { if (ret < 0) {
ret = parse_redundancy(s, options->value.s); error_setg(errp, "Invalid redundancy mode: '%s'", buf);
if (ret < 0) { goto out;
error_setg(errp, "Invalid redundancy mode: '%s'",
options->value.s);
goto out;
}
}
} }
options++;
} }
if (s->inode.vdi_size > SD_MAX_VDI_SIZE) { if (s->inode.vdi_size > SD_MAX_VDI_SIZE) {
@ -1770,6 +1765,8 @@ static int sd_create(const char *filename, QEMUOptionParameter *options,
ret = sd_prealloc(filename, errp); ret = sd_prealloc(filename, errp);
} }
out: out:
g_free(backing_file);
g_free(buf);
g_free(s); g_free(s);
return ret; return ret;
} }
@ -2571,28 +2568,32 @@ static int64_t sd_get_allocated_file_size(BlockDriverState *bs)
return size; return size;
} }
static QEMUOptionParameter sd_create_options[] = { static QemuOptsList sd_create_opts = {
{ .name = "sheepdog-create-opts",
.name = BLOCK_OPT_SIZE, .head = QTAILQ_HEAD_INITIALIZER(sd_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,
{ .type = QEMU_OPT_STRING,
.name = BLOCK_OPT_PREALLOC, .help = "File name of a base image"
.type = OPT_STRING, },
.help = "Preallocation mode (allowed values: off, full)" {
}, .name = BLOCK_OPT_PREALLOC,
{ .type = QEMU_OPT_STRING,
.name = BLOCK_OPT_REDUNDANCY, .help = "Preallocation mode (allowed values: off, full)"
.type = OPT_STRING, },
.help = "Redundancy of the image" {
}, .name = BLOCK_OPT_REDUNDANCY,
{ NULL } .type = QEMU_OPT_STRING,
.help = "Redundancy of the image"
},
{ /* end of list */ }
}
}; };
static BlockDriver bdrv_sheepdog = { static BlockDriver bdrv_sheepdog = {
@ -2602,7 +2603,7 @@ static BlockDriver bdrv_sheepdog = {
.bdrv_needs_filename = true, .bdrv_needs_filename = true,
.bdrv_file_open = sd_open, .bdrv_file_open = sd_open,
.bdrv_close = sd_close, .bdrv_close = sd_close,
.bdrv_create = sd_create, .bdrv_create2 = sd_create,
.bdrv_has_zero_init = bdrv_has_zero_init_1, .bdrv_has_zero_init = bdrv_has_zero_init_1,
.bdrv_getlength = sd_getlength, .bdrv_getlength = sd_getlength,
.bdrv_get_allocated_file_size = sd_get_allocated_file_size, .bdrv_get_allocated_file_size = sd_get_allocated_file_size,
@ -2625,7 +2626,7 @@ static BlockDriver bdrv_sheepdog = {
.bdrv_detach_aio_context = sd_detach_aio_context, .bdrv_detach_aio_context = sd_detach_aio_context,
.bdrv_attach_aio_context = sd_attach_aio_context, .bdrv_attach_aio_context = sd_attach_aio_context,
.create_options = sd_create_options, .create_opts = &sd_create_opts,
}; };
static BlockDriver bdrv_sheepdog_tcp = { static BlockDriver bdrv_sheepdog_tcp = {
@ -2635,7 +2636,7 @@ static BlockDriver bdrv_sheepdog_tcp = {
.bdrv_needs_filename = true, .bdrv_needs_filename = true,
.bdrv_file_open = sd_open, .bdrv_file_open = sd_open,
.bdrv_close = sd_close, .bdrv_close = sd_close,
.bdrv_create = sd_create, .bdrv_create2 = sd_create,
.bdrv_has_zero_init = bdrv_has_zero_init_1, .bdrv_has_zero_init = bdrv_has_zero_init_1,
.bdrv_getlength = sd_getlength, .bdrv_getlength = sd_getlength,
.bdrv_get_allocated_file_size = sd_get_allocated_file_size, .bdrv_get_allocated_file_size = sd_get_allocated_file_size,
@ -2658,7 +2659,7 @@ static BlockDriver bdrv_sheepdog_tcp = {
.bdrv_detach_aio_context = sd_detach_aio_context, .bdrv_detach_aio_context = sd_detach_aio_context,
.bdrv_attach_aio_context = sd_attach_aio_context, .bdrv_attach_aio_context = sd_attach_aio_context,
.create_options = sd_create_options, .create_opts = &sd_create_opts,
}; };
static BlockDriver bdrv_sheepdog_unix = { static BlockDriver bdrv_sheepdog_unix = {
@ -2668,7 +2669,7 @@ static BlockDriver bdrv_sheepdog_unix = {
.bdrv_needs_filename = true, .bdrv_needs_filename = true,
.bdrv_file_open = sd_open, .bdrv_file_open = sd_open,
.bdrv_close = sd_close, .bdrv_close = sd_close,
.bdrv_create = sd_create, .bdrv_create2 = sd_create,
.bdrv_has_zero_init = bdrv_has_zero_init_1, .bdrv_has_zero_init = bdrv_has_zero_init_1,
.bdrv_getlength = sd_getlength, .bdrv_getlength = sd_getlength,
.bdrv_get_allocated_file_size = sd_get_allocated_file_size, .bdrv_get_allocated_file_size = sd_get_allocated_file_size,
@ -2691,7 +2692,7 @@ static BlockDriver bdrv_sheepdog_unix = {
.bdrv_detach_aio_context = sd_detach_aio_context, .bdrv_detach_aio_context = sd_detach_aio_context,
.bdrv_attach_aio_context = sd_attach_aio_context, .bdrv_attach_aio_context = sd_attach_aio_context,
.create_options = sd_create_options, .create_opts = &sd_create_opts,
}; };
static void bdrv_sheepdog_init(void) static void bdrv_sheepdog_init(void)