diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-02-12 17:49:02 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-02-26 14:48:31 +0100 |
| commit | 6be4194b9215ed29f258543ce34a1b4b2003864d (patch) | |
| tree | b729e35973c623d5bb9850b92d00d7ed43980a19 | |
| parent | 6750e795b167e3defab36502e61b8c57ede119eb (diff) | |
| download | focaccia-qemu-6be4194b9215ed29f258543ce34a1b4b2003864d.tar.gz focaccia-qemu-6be4194b9215ed29f258543ce34a1b4b2003864d.zip | |
block: Suppress unhelpful extra errors in bdrv_img_create()
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 <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | block.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/block.c b/block.c index f59c4cf898..f5ae5cd26c 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; |