diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-02-12 18:37:11 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-02-26 14:51:21 +0100 |
| commit | dc523cd348c47372faa7271c9aab2030f94c290d (patch) | |
| tree | 594f8b952d8defb7a00ce2eb02d140265ea411ca /include/qemu | |
| parent | 4f81273dd9e036f9009ab902a2617a1167cf796d (diff) | |
| download | qemu-dc523cd348c47372faa7271c9aab2030f94c290d.zip qemu-dc523cd348c47372faa7271c9aab2030f94c290d.tar.gz qemu-dc523cd348c47372faa7271c9aab2030f94c290d.tar.bz2 | |
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>
Diffstat (limited to 'include/qemu')
| -rw-r--r-- | include/qemu/option.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/qemu/option.h b/include/qemu/option.h index a41ee92..f88b545 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -115,7 +115,8 @@ const char *qemu_opts_id(QemuOpts *opts); void qemu_opts_set_id(QemuOpts *opts, char *id); void qemu_opts_del(QemuOpts *opts); void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp); -int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname); +void qemu_opts_do_parse(QemuOpts *opts, const char *params, + const char *firstname, Error **errp); QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params, int permit_abbrev); void qemu_opts_set_defaults(QemuOptsList *list, const char *params, int permit_abbrev); |