[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 36/38] block: Clean up bdrv_img_create()'s error
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 36/38] block: Clean up bdrv_img_create()'s error reporting |
Date: |
Tue, 16 Oct 2018 19:41:56 +0200 |
bdrv_img_create() takes an Error ** argument and uses it in the
conventional way, except for one place: when qemu_opts_do_parse()
fails, it first reports its error to stderr or the HMP monitor with
error_report_err(), then error_setg()'s a generic error.
When the caller reports that second error similarly, this produces two
consecutive error messages on stderr or the HMP monitor.
When the caller does something else with it, such as send it via QMP,
the first error still goes to stderr or the HMP monitor. Fortunately,
no such caller exists.
Simply use the first error as is.
Signed-off-by: Markus Armbruster <address@hidden>
---
block.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/block.c b/block.c
index 5d51419d21..08d64cdc61 100644
--- a/block.c
+++ b/block.c
@@ -4803,9 +4803,6 @@ void bdrv_img_create(const char *filename, const char
*fmt,
if (options) {
qemu_opts_do_parse(opts, options, NULL, &local_err);
if (local_err) {
- error_report_err(local_err);
- local_err = NULL;
- error_setg(errp, "Invalid options for file format '%s'", fmt);
goto out;
}
}
--
2.17.1
- [Qemu-devel] [PATCH v3 32/38] vl: Assert drive_new() does not fail in default_drive(), (continued)
- [Qemu-devel] [PATCH v3 32/38] vl: Assert drive_new() does not fail in default_drive(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 38/38] vpc: Fail open on bad header checksum, Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 24/38] vl: Clean up error reporting in device_init_func(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 21/38] vl: Clean up error reporting in machine_set_property(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 23/38] vl: Clean up error reporting in parse_fw_cfg(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 19/38] qom: Clean up error reporting in user_creatable_add_opts_foreach(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 17/38] seccomp: Clean up error reporting in parse_sandbox(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 37/38] raw: Convert a warning to warn_report(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 36/38] block: Clean up bdrv_img_create()'s error reporting,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 27/38] vnc: Clean up error reporting in vnc_init_func(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 26/38] ui: Convert vnc_display_init(), init_keyboard_layout() to Error, Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 31/38] fsdev: Clean up error reporting in qemu_fsdev_add(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 35/38] vl: Simplify call of parse_name(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 25/38] ui/keymaps: Fix handling of erroneous include files, Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 33/38] blockdev: Convert drive_new() to Error, Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 30/38] spice: Clean up error reporting in add_channel(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 04/38] cpus hw target: Use warn_report() & friends to report warnings, Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 34/38] vl: Fix exit status for -drive format=help, Markus Armbruster, 2018/10/16