Commit 6be4194b authored by Markus Armbruster's avatar Markus Armbruster
Browse files

block: Suppress unhelpful extra errors in bdrv_img_create() 



bdrv_img_create() uses qemu_opt_set(), which reports errors with
qerror_report_err().  Its error messages aren't helpful here, the
caller reports one that actually makes sense.  I don't know how to
trigger the error conditions, though.

Switch to qemu_opt_set_err() to get rid of the unwanted messages.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 6750e795

block.c

+5 −2
Original line number Diff line number Diff line
@@ -5660,7 +5660,9 @@ void bdrv_img_create(const char *filename, const char *fmt, 
    }



    if (base_filename) {

        if (qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, base_filename)) {

        qemu_opt_set_err(opts, BLOCK_OPT_BACKING_FILE, base_filename,

                         &local_err);

        if (local_err) {

            error_setg(errp, "Backing file not supported for file format '%s'",

                       fmt);

            goto out;
@@ -5668,7 +5670,8 @@ void bdrv_img_create(const char *filename, const char *fmt, 
    }



    if (base_fmt) {

        if (qemu_opt_set(opts, BLOCK_OPT_BACKING_FMT, base_fmt)) {

        qemu_opt_set_err(opts, BLOCK_OPT_BACKING_FMT, base_fmt, &local_err);

        if (local_err) {

            error_setg(errp, "Backing file format not supported for file "

                             "format '%s'", fmt);

            goto out;