[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/13] block: Suppress unhelpful extra errors in bdrv
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 05/13] block: Suppress unhelpful extra errors in bdrv_img_create() |
Date: |
Thu, 26 Feb 2015 15:07:20 +0100 |
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: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index f59c4cf..f5ae5cd 100644
--- a/block.c
+++ b/block.c
@@ -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;
--
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, 2015/02/26
- [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 <=
- [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