[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/13] qemu-img: Suppress unhelpful extra errors in c
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 04/13] qemu-img: Suppress unhelpful extra errors in convert, resize |
Date: |
Thu, 26 Feb 2015 15:07:19 +0100 |
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: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
qemu-img.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 752eecb..702a051 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -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;
--
1.9.3
- [Qemu-devel] [PULL 00/13] QemuOpts: Convert various setters to Error, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 01/13] QemuOpts: Convert qemu_opt_set_bool() to Error, fix its use, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 02/13] QemuOpts: Convert qemu_opt_set_number() to Error, fix its use, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 04/13] qemu-img: Suppress unhelpful extra errors in convert, resize,
Markus Armbruster <=
- [Qemu-devel] [PULL 10/13] block: Simplify setting numeric options, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 07/13] QemuOpts: Propagate errors through opts_do_parse(), Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 08/13] QemuOpts: Propagate errors through opts_parse(), Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 11/13] qemu-sockets: Simplify setting numeric and boolean options, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 06/13] QemuOpts: Drop qemu_opt_set(), rename qemu_opt_set_err(), fix use, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 05/13] block: Suppress unhelpful extra errors in bdrv_img_create(), Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 13/13] qtest: Use qemu_opt_set() instead of qemu_opts_parse(), Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 12/13] pc: Use qemu_opt_set() instead of qemu_opts_parse(), Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 09/13] qemu-img: Suppress unhelpful extra errors in convert, amend, Markus Armbruster, 2015/02/26
- [Qemu-devel] [PULL 03/13] QemuOpts: Convert qemu_opts_set() to Error, fix its use, Markus Armbruster, 2015/02/26