| Message ID | 1392186806-10418-8-git-send-email-cyliu@suse.com |
|---|---|
| State | New |
| Headers | show |
On 02/11/2014 11:33 PM, Chunyan Liu wrote: > cow.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/cow.c | 46 ++++++++++++++++++++++------------------------ > 1 files changed, 22 insertions(+), 24 deletions(-) > > +static QemuOptsList cow_create_opts = { > + .name = "cow-create-opts", > + .head = QTAILQ_HEAD_INITIALIZER(cow_create_opts.head), > + .desc = { > + { > + .name = BLOCK_OPT_SIZE, > + .type = QEMU_OPT_SIZE, > + .help = "Virtual disk size" Oh, these QemuOpts really ARE constant strings in the general case, and passing these strings to free() could be a disaster. I hope we're okay in what we do; in fact, maybe it's worth a patch to QemuOptsList that adds a bool record of whether the list is dynamically allocated (false by default for all static initialization, and true when malloc'ing a list) and then asserting that attempts to free (parts of) a list are only done on a dynamically allocated list. > @@ -414,14 +412,14 @@ static BlockDriver bdrv_cow = { > .bdrv_probe = cow_probe, > .bdrv_open = cow_open, > .bdrv_close = cow_close, > - .bdrv_create = cow_create, > + .bdrv_create2 = cow_create, Might as well keep alignment looking nice.
2014-02-13 8:19 GMT+08:00 Eric Blake <eblake@redhat.com>: > On 02/11/2014 11:33 PM, Chunyan Liu wrote: > > cow.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/cow.c | 46 ++++++++++++++++++++++------------------------ > > 1 files changed, 22 insertions(+), 24 deletions(-) > > > > > +static QemuOptsList cow_create_opts = { > > + .name = "cow-create-opts", > > + .head = QTAILQ_HEAD_INITIALIZER(cow_create_opts.head), > > + .desc = { > > + { > > + .name = BLOCK_OPT_SIZE, > > + .type = QEMU_OPT_SIZE, > > + .help = "Virtual disk size" > > Oh, these QemuOpts really ARE constant strings in the general case, and > passing these strings to free() could be a disaster. I hope we're okay > in what we do; in fact, maybe it's worth a patch to QemuOptsList that > adds a bool record of whether the list is dynamically allocated (false > by default for all static initialization, and true when malloc'ing a > list) and then asserting that attempts to free (parts of) a list are > only done on a dynamically allocated list. > > Well, create_opts specified here won't be freed by free() in existing code I thi nk. Those using it would malloc and memcpy from it, and that would be freed. The same way as existing create_options handling. > > @@ -414,14 +412,14 @@ static BlockDriver bdrv_cow = { > > .bdrv_probe = cow_probe, > > .bdrv_open = cow_open, > > .bdrv_close = cow_close, > > - .bdrv_create = cow_create, > > + .bdrv_create2 = cow_create, > > Might as well keep alignment looking nice. > > -- > Eric Blake eblake redhat com +1-919-301-3266 > Libvirt virtualization library http://libvirt.org > >
diff --git a/block/cow.c b/block/cow.c index 85c2971..0d06781 100644 --- a/block/cow.c +++ b/block/cow.c @@ -323,7 +323,7 @@ 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) { struct cow_header_v2 cow_header; @@ -335,16 +335,10 @@ static int cow_create(const char *filename, QEMUOptionParameter *options, BlockDriverState *cow_bs; /* Read out options */ - while (options && options->name) { - if (!strcmp(options->name, BLOCK_OPT_SIZE)) { - image_sectors = options->value.n / 512; - } else if (!strcmp(options->name, BLOCK_OPT_BACKING_FILE)) { - image_filename = options->value.s; - } - options++; - } + image_sectors = qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / 512; + image_filename = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FILE); - ret = bdrv_create_file(filename, options, NULL, &local_err); + ret = bdrv_create_file(filename, NULL, opts, &local_err); if (ret < 0) { qerror_report_err(local_err); error_free(local_err); @@ -393,18 +387,22 @@ exit: return ret; } -static QEMUOptionParameter cow_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" - }, - { NULL } +static QemuOptsList cow_create_opts = { + .name = "cow-create-opts", + .head = QTAILQ_HEAD_INITIALIZER(cow_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" + }, + { /* end of list */ } + } }; static BlockDriver bdrv_cow = { @@ -414,14 +412,14 @@ static BlockDriver bdrv_cow = { .bdrv_probe = cow_probe, .bdrv_open = cow_open, .bdrv_close = cow_close, - .bdrv_create = cow_create, + .bdrv_create2 = cow_create, .bdrv_has_zero_init = bdrv_has_zero_init_1, .bdrv_read = cow_co_read, .bdrv_write = cow_co_write, .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)