]> git.proxmox.com Git - mirror_qemu.git/commit
block: Clean up bdrv_img_create()'s error reporting
authorMarkus Armbruster <armbru@redhat.com>
Wed, 17 Oct 2018 08:27:00 +0000 (10:27 +0200)
committerMarkus Armbruster <armbru@redhat.com>
Fri, 19 Oct 2018 12:51:34 +0000 (14:51 +0200)
commitda7e92cac95fd3b7f91354d2d65b5d59ea36dc13
tree521072a503faef35d2d4058f1d08ac96e0fef0e8
parent5343bda42ba1abe61d81ac6b7712e118a3f74280
block: Clean up bdrv_img_create()'s error reporting

bdrv_img_create() takes an Error ** argument and uses it in the
conventional way, except for one place: when qemu_opts_do_parse()
fails, it first reports its error to stderr or the HMP monitor with
error_report_err(), then error_setg()'s a generic error.

When the caller reports that second error similarly, this produces two
consecutive error messages on stderr or the HMP monitor.

When the caller does something else with it, such as send it via QMP,
the first error still goes to stderr or the HMP monitor.  Fortunately,
no such caller exists.

Simply use the first error as is.  Update expected output of
qemu-iotest 049 accordingly.

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Max Reitz <mreitz@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20181017082702.5581-37-armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
block.c
tests/qemu-iotests/049.out