This series fixes some small issues I found in qemu-img's convert
subcommand while reviewing Dan's convert/dd series.

Nothing serious at all, so all for 2.10.


Max Reitz (3):
  qemu-img/convert: Always set ret < 0 on error
  qemu-img/convert: Use @opts for one thing only
  qemu-img/convert: Move bs_n > 1 && -B check down

 qemu-img.c                 | 26 +++++++++++++++-----------
 tests/qemu-iotests/122.out |  4 ++--
 2 files changed, 17 insertions(+), 13 deletions(-)

-- 
2.12.2

Am 13.04.2017 um 22:33 hat Max Reitz geschrieben:
> This series fixes some small issues I found in qemu-img's convert
> subcommand while reviewing Dan's convert/dd series.
> 
> Nothing serious at all, so all for 2.10.

This series conflicts with Peter Lieven's "qemu-img: simplify
img_convert" in my block-next branch.

Patch 1 is unnecessary now (ret is still -EINVAL at this point), the
other two probably just need rebasing.

Kevin

On 19.04.2017 17:49, Kevin Wolf wrote:
> Am 13.04.2017 um 22:33 hat Max Reitz geschrieben:
>> This series fixes some small issues I found in qemu-img's convert
>> subcommand while reviewing Dan's convert/dd series.
>>
>> Nothing serious at all, so all for 2.10.
> 
> This series conflicts with Peter Lieven's "qemu-img: simplify
> img_convert" in my block-next branch.
> 
> Patch 1 is unnecessary now (ret is still -EINVAL at this point), the
> other two probably just need rebasing.

Hm... What should I do about qemu-stable, though? I don't think that
Peter's series will end up there, so qemu-stable should probably indeed
take v1...

Max

Am 26.04.2017 um 14:48 hat Max Reitz geschrieben:
> On 19.04.2017 17:49, Kevin Wolf wrote:
> > Am 13.04.2017 um 22:33 hat Max Reitz geschrieben:
> >> This series fixes some small issues I found in qemu-img's convert
> >> subcommand while reviewing Dan's convert/dd series.
> >>
> >> Nothing serious at all, so all for 2.10.
> > 
> > This series conflicts with Peter Lieven's "qemu-img: simplify
> > img_convert" in my block-next branch.
> > 
> > Patch 1 is unnecessary now (ret is still -EINVAL at this point), the
> > other two probably just need rebasing.
> 
> Hm... What should I do about qemu-stable, though? I don't think that
> Peter's series will end up there, so qemu-stable should probably indeed
> take v1...

Yes, this is true. We probably need a patch specifically for qemu-stable
then and a different one for master.

Kevin