• M
    qemu-img/convert: Use @opts for one thing only · a1c850fd
    Max Reitz 提交于
    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: NMax Reitz <mreitz@redhat.com>
    Reviewed-by: NEric Blake <eblake@redhat.com>
    * applied patch from v1 of series as suggested by author
    Signed-off-by: NMichael Roth <mdroth@linux.vnet.ibm.com>
    a1c850fd
qemu-img.c 127.7 KB