[Qemu-devel] [PATCH v2 0/3] qemu-img/convert: Some small fixes

[Max Reitz <mreitz@redhat.com>]

This series fixes some small issues in qemu-img's convert subcommand.


v2:
- Not CC'd to qemu-stable: This is mostly a rebase onto block-next, and
  the patches that make a difference will not appear in qemu-stable.
  Therefore, if this is merged, v1 will be good for qemu-stable.
- Dropped the old patch 1, it became superfluous
- (New) patch 2: Rebased onto block-next
  - %s/bs_n/s.src_num/g
  - The block that's removed no longer sets ret to -1; but we still have
    to do this in the block that's added (and don't set it to -EINVAL
    there because all the places around it use -1 as well and -EINVAL
    would thus look weird).
- (New) patch 3: Added, as reported by Eric


git-backport-diff against v1:

Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch
[down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively

001/3:[----] [-C] 'qemu-img/convert: Use @opts for one thing only'
002/3:[0007] [FC] 'qemu-img/convert: Move bs_n > 1 && -B check down'
003/3:[down] 'qemu-img: Document backing options'


Max Reitz (3):
  qemu-img/convert: Use @opts for one thing only
  qemu-img/convert: Move bs_n > 1 && -B check down
  qemu-img: Document backing options

 qemu-img.c                 | 23 +++++++++++++----------
 qemu-img-cmds.hx           |  8 ++++----
 qemu-img.texi              |  4 ++--
 tests/qemu-iotests/122.out |  4 ++--
 4 files changed, 21 insertions(+), 18 deletions(-)

-- 
2.12.2