Commit 6750e795 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qemu-img: Suppress unhelpful extra errors in convert, resize 



add_old_style_options() for img_convert() and img_resize() use
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.  Reproducer:

    $ qemu-img convert -B raw in.img out.img
    qemu-img: Invalid parameter 'backing_file'
    qemu-img: Backing file not supported for file format 'raw'

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 79087c78

qemu-img.c

+12 −4
Original line number Diff line number Diff line
@@ -332,17 +332,23 @@ static int add_old_style_options(const char *fmt, QemuOpts *opts, 
                                 const char *base_filename,

                                 const char *base_fmt)

{

    Error *err = NULL;



    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, &err);

        if (err) {

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

                         fmt);

            error_free(err);

            return -1;

        }

    }

    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, &err);

        if (err) {

            error_report("Backing file format not supported for file "

                         "format '%s'", fmt);

            error_free(err);

            return -1;

        }

    }
@@ -2750,6 +2756,7 @@ out: 


static int img_resize(int argc, char **argv)

{

    Error *err = NULL;

    int c, ret, relative;

    const char *filename, *fmt, *size;

    int64_t n, total_size;
@@ -2821,8 +2828,9 @@ static int img_resize(int argc, char **argv) 


    /* Parse size */

    param = qemu_opts_create(&resize_options, NULL, 0, &error_abort);

    if (qemu_opt_set(param, BLOCK_OPT_SIZE, size)) {

        /* Error message already printed when size parsing fails */

    qemu_opt_set_err(param, BLOCK_OPT_SIZE, size, &err);

    if (err) {

        error_report_err(err);

        ret = -1;

        qemu_opts_del(param);

        goto out;