]> git.proxmox.com Git - mirror_qemu.git/commit - block.c
qemu-img: Suppress unhelpful extra errors in convert, amend
authorMarkus Armbruster <armbru@redhat.com>
Thu, 12 Feb 2015 17:37:11 +0000 (18:37 +0100)
committerMarkus Armbruster <armbru@redhat.com>
Thu, 26 Feb 2015 13:51:21 +0000 (14:51 +0100)
commitdc523cd348c47372faa7271c9aab2030f94c290d
tree594f8b952d8defb7a00ce2eb02d140265ea411ca
parent4f81273dd9e036f9009ab902a2617a1167cf796d
qemu-img: Suppress unhelpful extra errors in convert, amend

img_convert() and img_amend() use qemu_opts_do_parse(), which reports
errors with qerror_report_err().  Its error messages aren't helpful
here, the caller reports one that actually makes sense.  Reproducer:

    $ qemu-img convert -o backing_format=raw in.img out.img
    qemu-img: Invalid parameter 'backing_format'
    qemu-img: Invalid options for file format 'raw'

To fix, propagate errors through qemu_opts_do_parse().  This lifts the
error reporting into callers.  Drop it from img_convert() and
img_amend(), keep it in qemu_chr_parse_compat(), bdrv_img_create().

Since I'm touching qemu_opts_do_parse() anyway, write a function
comment for it.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
block.c
include/qemu/option.h
qemu-char.c
qemu-img.c
util/qemu-option.c