On 02/20/2014 07:57 AM, Kevin Wolf wrote: > Instead of ignoring all option values but the last one, multiple -o > options now have the same meaning as having a single option with all > settings in the order of their respective -o options. > > Signed-off-by: Kevin Wolf <kw...@redhat.com> > --- > qemu-img.c | 29 ++++++++++++++++++++--------- > 1 file changed, 20 insertions(+), 9 deletions(-)
Same comment as in 2/6 about the surprise of a trailing comma empty
option turning into a literal comma.
> @@ -1191,13 +1194,21 @@ static int img_convert(int argc, char **argv)
> case 'e':
> error_report("option -e is deprecated, please use \'-o "
> "encryption\' instead!");
> - return 1;
> + ret = -1;
> + goto out;
I had to look, but the out: label does indeed turn a ret of -1 into a
'return 1' at the end of the day.
Reviewed-by: Eric Blake <ebl...@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
