| Message ID | 1392186806-10418-19-git-send-email-cyliu@suse.com |
|---|---|
| State | New |
| Headers | show |
On 02/11/2014 11:33 PM, Chunyan Liu wrote: > sheepdog.c: replace QEMUOptionParameter with QemuOpts > > Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com> > Signed-off-by: Chunyan Liu <cyliu@suse.com> > --- > block/sheepdog.c | 101 +++++++++++++++++++++++++----------------------------- > 1 files changed, 47 insertions(+), 54 deletions(-) > > + > + buf = NULL; > + buf = qemu_opt_get_del(opts, BLOCK_OPT_REDUNDANCY); Dead NULL assignment. > + if (buf) { > + ret = parse_redundancy(s, buf); > + if (ret < 0) { > + goto out; > } Do you need to store into ret here, or is it sufficient to use 'if (parse_redundancy(s, buf) < 0) {' > - { > - .name = BLOCK_OPT_REDUNDANCY, > - .type = OPT_STRING, > - .help = "Redundancy of the image" > - }, > - { NULL } > +static QemuOptsList sd_create_opts = { > + .name = "sheepdog-create-opts", > + .head = QTAILQ_HEAD_INITIALIZER(sd_create_opts.head), > + .desc = { > + { > + .name = BLOCK_OPT_PREALLOC, > + .type = QEMU_OPT_STRING, > + .help = "Preallocation mode (allowed values: off, full)" > + }, > + { /* end of list */ } Missing redundancy in the new list. > @@ -2538,7 +2533,7 @@ static BlockDriver bdrv_sheepdog = { > .bdrv_save_vmstate = sd_save_vmstate, > .bdrv_load_vmstate = sd_load_vmstate, > > - .create_options = sd_create_options, > + .create_opts = &sd_create_opts, Another example of the inconsistent use of &. > }; > > static BlockDriver bdrv_sheepdog_tcp = { > @@ -2548,7 +2543,7 @@ static BlockDriver bdrv_sheepdog_tcp = { > .bdrv_needs_filename = true, > .bdrv_file_open = sd_open, > .bdrv_close = sd_close, > - .bdrv_create = sd_create, > + .bdrv_create2 = sd_create, > .bdrv_has_zero_init = bdrv_has_zero_init_1, > .bdrv_getlength = sd_getlength, > .bdrv_get_allocated_file_size = sd_get_allocated_file_size, > @@ -2568,7 +2563,6 @@ static BlockDriver bdrv_sheepdog_tcp = { > .bdrv_save_vmstate = sd_save_vmstate, > .bdrv_load_vmstate = sd_load_vmstate, > > - .create_options = sd_create_options, > }; Why no .create_opts replacement?
2014-02-18 3:01 GMT+08:00 Eric Blake <eblake@redhat.com>: > On 02/11/2014 11:33 PM, Chunyan Liu wrote: > > sheepdog.c: replace QEMUOptionParameter with QemuOpts > > > > Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com> > > Signed-off-by: Chunyan Liu <cyliu@suse.com> > > --- > > block/sheepdog.c | 101 > +++++++++++++++++++++++++----------------------------- > > 1 files changed, 47 insertions(+), 54 deletions(-) > > > > > + > > + buf = NULL; > > + buf = qemu_opt_get_del(opts, BLOCK_OPT_REDUNDANCY); > > Dead NULL assignment. > > > + if (buf) { > > + ret = parse_redundancy(s, buf); > > + if (ret < 0) { > > + goto out; > > } > > Do you need to store into ret here, or is it sufficient to use 'if > (parse_redundancy(s, buf) < 0) {' > > It followed the logic in existing code. If function ret < 0, return with that return value. Same logic in earlier codes of the function. if (strstr(filename, "://")) { ret = sd_parse_uri(s, filename, s->name, &snapid, tag); } else { ret = parse_vdiname(s, filename, s->name, &snapid, tag); } if (ret < 0) { goto out; } > > - { > > - .name = BLOCK_OPT_REDUNDANCY, > > - .type = OPT_STRING, > > - .help = "Redundancy of the image" > > - }, > > - { NULL } > > +static QemuOptsList sd_create_opts = { > > + .name = "sheepdog-create-opts", > > + .head = QTAILQ_HEAD_INITIALIZER(sd_create_opts.head), > > + .desc = { > > + { > > > + .name = BLOCK_OPT_PREALLOC, > > + .type = QEMU_OPT_STRING, > > + .help = "Preallocation mode (allowed values: off, full)" > > + }, > > + { /* end of list */ } > > Missing redundancy in the new list. > > > @@ -2538,7 +2533,7 @@ static BlockDriver bdrv_sheepdog = { > > .bdrv_save_vmstate = sd_save_vmstate, > > .bdrv_load_vmstate = sd_load_vmstate, > > > > - .create_options = sd_create_options, > > + .create_opts = &sd_create_opts, > > Another example of the inconsistent use of &. > > > }; > > > > static BlockDriver bdrv_sheepdog_tcp = { > > @@ -2548,7 +2543,7 @@ static BlockDriver bdrv_sheepdog_tcp = { > > .bdrv_needs_filename = true, > > .bdrv_file_open = sd_open, > > .bdrv_close = sd_close, > > - .bdrv_create = sd_create, > > + .bdrv_create2 = sd_create, > > .bdrv_has_zero_init = bdrv_has_zero_init_1, > > .bdrv_getlength = sd_getlength, > > .bdrv_get_allocated_file_size = sd_get_allocated_file_size, > > @@ -2568,7 +2563,6 @@ static BlockDriver bdrv_sheepdog_tcp = { > > .bdrv_save_vmstate = sd_save_vmstate, > > .bdrv_load_vmstate = sd_load_vmstate, > > > > - .create_options = sd_create_options, > > }; > > Why no .create_opts replacement? > > -- > Eric Blake eblake redhat com +1-919-301-3266 > Libvirt virtualization library http://libvirt.org > >
diff --git a/block/sheepdog.c b/block/sheepdog.c index 672b9c9..ca9adc3 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -1625,12 +1625,13 @@ static int parse_redundancy(BDRVSheepdogState *s, const char *opt) return 0; } -static int sd_create(const char *filename, QEMUOptionParameter *options, +static int sd_create(const char *filename, QemuOpts *opts, Error **errp) { int ret = 0; uint32_t vid = 0; - char *backing_file = NULL; + const char *backing_file = NULL; + const char *buf = NULL; BDRVSheepdogState *s; char tag[SD_MAX_VDI_TAG_LEN]; uint32_t snapid; @@ -1649,31 +1650,26 @@ static int sd_create(const char *filename, QEMUOptionParameter *options, goto out; } - while (options && options->name) { - if (!strcmp(options->name, BLOCK_OPT_SIZE)) { - s->inode.vdi_size = options->value.n; - } else if (!strcmp(options->name, BLOCK_OPT_BACKING_FILE)) { - backing_file = options->value.s; - } else if (!strcmp(options->name, BLOCK_OPT_PREALLOC)) { - if (!options->value.s || !strcmp(options->value.s, "off")) { - prealloc = false; - } else if (!strcmp(options->value.s, "full")) { - prealloc = true; - } else { - error_report("Invalid preallocation mode: '%s'", - options->value.s); - ret = -EINVAL; - goto out; - } - } else if (!strcmp(options->name, BLOCK_OPT_REDUNDANCY)) { - if (options->value.s) { - ret = parse_redundancy(s, options->value.s); - if (ret < 0) { - goto out; - } - } + s->inode.vdi_size = qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0); + backing_file = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FILE); + buf = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); + if (!buf || !strcmp(buf, "off")) { + prealloc = false; + } else if (!strcmp(buf, "full")) { + prealloc = true; + } else { + error_report("Invalid preallocation mode: '%s'", buf); + ret = -EINVAL; + goto out; + } + + buf = NULL; + buf = qemu_opt_get_del(opts, BLOCK_OPT_REDUNDANCY); + if (buf) { + ret = parse_redundancy(s, buf); + if (ret < 0) { + goto out; } - options++; } if (s->inode.vdi_size > SD_MAX_VDI_SIZE) { @@ -2487,28 +2483,27 @@ static int64_t sd_get_allocated_file_size(BlockDriverState *bs) return size; } -static QEMUOptionParameter sd_create_options[] = { - { - .name = BLOCK_OPT_SIZE, - .type = OPT_SIZE, - .help = "Virtual disk size" - }, - { - .name = BLOCK_OPT_BACKING_FILE, - .type = OPT_STRING, - .help = "File name of a base image" - }, - { - .name = BLOCK_OPT_PREALLOC, - .type = OPT_STRING, - .help = "Preallocation mode (allowed values: off, full)" - }, - { - .name = BLOCK_OPT_REDUNDANCY, - .type = OPT_STRING, - .help = "Redundancy of the image" - }, - { NULL } +static QemuOptsList sd_create_opts = { + .name = "sheepdog-create-opts", + .head = QTAILQ_HEAD_INITIALIZER(sd_create_opts.head), + .desc = { + { + .name = BLOCK_OPT_SIZE, + .type = QEMU_OPT_SIZE, + .help = "Virtual disk size" + }, + { + .name = BLOCK_OPT_BACKING_FILE, + .type = QEMU_OPT_STRING, + .help = "File name of a base image" + }, + { + .name = BLOCK_OPT_PREALLOC, + .type = QEMU_OPT_STRING, + .help = "Preallocation mode (allowed values: off, full)" + }, + { /* end of list */ } + } }; static BlockDriver bdrv_sheepdog = { @@ -2518,7 +2513,7 @@ static BlockDriver bdrv_sheepdog = { .bdrv_needs_filename = true, .bdrv_file_open = sd_open, .bdrv_close = sd_close, - .bdrv_create = sd_create, + .bdrv_create2 = sd_create, .bdrv_has_zero_init = bdrv_has_zero_init_1, .bdrv_getlength = sd_getlength, .bdrv_get_allocated_file_size = sd_get_allocated_file_size, @@ -2538,7 +2533,7 @@ static BlockDriver bdrv_sheepdog = { .bdrv_save_vmstate = sd_save_vmstate, .bdrv_load_vmstate = sd_load_vmstate, - .create_options = sd_create_options, + .create_opts = &sd_create_opts, }; static BlockDriver bdrv_sheepdog_tcp = { @@ -2548,7 +2543,7 @@ static BlockDriver bdrv_sheepdog_tcp = { .bdrv_needs_filename = true, .bdrv_file_open = sd_open, .bdrv_close = sd_close, - .bdrv_create = sd_create, + .bdrv_create2 = sd_create, .bdrv_has_zero_init = bdrv_has_zero_init_1, .bdrv_getlength = sd_getlength, .bdrv_get_allocated_file_size = sd_get_allocated_file_size, @@ -2568,7 +2563,6 @@ static BlockDriver bdrv_sheepdog_tcp = { .bdrv_save_vmstate = sd_save_vmstate, .bdrv_load_vmstate = sd_load_vmstate, - .create_options = sd_create_options, }; static BlockDriver bdrv_sheepdog_unix = { @@ -2578,7 +2572,7 @@ static BlockDriver bdrv_sheepdog_unix = { .bdrv_needs_filename = true, .bdrv_file_open = sd_open, .bdrv_close = sd_close, - .bdrv_create = sd_create, + .bdrv_create2 = sd_create, .bdrv_has_zero_init = bdrv_has_zero_init_1, .bdrv_getlength = sd_getlength, .bdrv_get_allocated_file_size = sd_get_allocated_file_size, @@ -2598,7 +2592,6 @@ static BlockDriver bdrv_sheepdog_unix = { .bdrv_save_vmstate = sd_save_vmstate, .bdrv_load_vmstate = sd_load_vmstate, - .create_options = sd_create_options, }; static void bdrv_sheepdog_init(void)