On 02/11/2014 11:33 PM, Chunyan Liu wrote: > qcow2.c: replace QEMUOptionParameter with QemuOpts in 'qemu-img create'. > > Signed-off-by: Dong Xu Wang <[email protected]> > Signed-off-by: Chunyan Liu <[email protected]> > --- > block/qcow2.c | 176 ++++++++++++++++++++++++++++---------------------------- > 1 files changed, 88 insertions(+), 88 deletions(-) >
> + buf = NULL;
> + buf = qemu_opt_get_del(opts, BLOCK_OPT_COMPAT_LEVEL);
Dead assignment to NULL.
> + if (!buf || !strcmp(buf, "0.10")) {
> + version = 2;
> + } else if (!strcmp(buf, "1.1")) {
> + version = 3;
> + } else {
> + fprintf(stderr, "Invalid compatibility level: '%s'\n",
> + buf);
Indentation looks off.
> @@ -1682,7 +1676,7 @@ static int qcow2_create(const char *filename,
> QEMUOptionParameter *options,
> }
>
> ret = qcow2_create2(filename, sectors, backing_file, backing_fmt, flags,
> - cluster_size, prealloc, options, version,
> &local_err);
> + cluster_size, prealloc, opts, version, &local_err);
> if (error_is_set(&local_err)) {
> error_propagate(errp, local_err);
Might conflict with other cleanups that is turning 'if
(error_is_set(&local_err))' into 'if (local_err)'
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
