| Message ID | 20170413203401.3213-3-mreitz@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/13/2017 03:34 PM, Max Reitz wrote: > After storing the creation options for the new image into @opts, we > fetch some things for our own information, like the backing file name, > or whether to use encryption or preallocation. > > With the -n parameter, there will not be any creation options; this is > not too bad because this just means that querying a NULL @opts will > always return the default value. > > However, we also use @opts for the --object options. Therefore, @opts is > not necessarily NULL if -n was specified; instead, it may contain those > options. In practice, this probably does not cause any problems because > there most likely is no object that supports any of the parameters we > query here, but this is neither something we should rely on nor does > this variable reuse make the code very nice to read. > > Therefore, just use an own variable for the --object options. > > Cc: qemu-stable <qemu-stable@nongnu.org> > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > qemu-img.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/qemu-img.c b/qemu-img.c index f2809e1ab4..70ffb07447 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2065,14 +2065,16 @@ static int img_convert(int argc, char **argv) case 'W': wr_in_order = false; break; - case OPTION_OBJECT: - opts = qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { + case OPTION_OBJECT: { + QemuOpts *object_opts; + object_opts = qemu_opts_parse_noisily(&qemu_object_opts, + optarg, true); + if (!object_opts) { ret = -1; goto fail_getopt; } break; + } case OPTION_IMAGE_OPTS: image_opts = true; break;
After storing the creation options for the new image into @opts, we fetch some things for our own information, like the backing file name, or whether to use encryption or preallocation. With the -n parameter, there will not be any creation options; this is not too bad because this just means that querying a NULL @opts will always return the default value. However, we also use @opts for the --object options. Therefore, @opts is not necessarily NULL if -n was specified; instead, it may contain those options. In practice, this probably does not cause any problems because there most likely is no object that supports any of the parameters we query here, but this is neither something we should rely on nor does this variable reuse make the code very nice to read. Therefore, just use an own variable for the --object options. Cc: qemu-stable <qemu-stable@nongnu.org> Signed-off-by: Max Reitz <mreitz@redhat.com> --- qemu-img.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)