From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQ9Z7-00032C-I6 for qemu-devel@nongnu.org; Thu, 21 Jul 2016 04:42:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQ9Yy-000444-63 for qemu-devel@nongnu.org; Thu, 21 Jul 2016 04:42:44 -0400 From: Reda Sallahi Date: Thu, 21 Jul 2016 10:41:53 +0200 Message-Id: <20160721084153.16103-1-fullmanet@gmail.com> Subject: [Qemu-devel] [PATCH] qemu-img: fix error messages emitted by img_open() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Kevin Wolf , Max Reitz , Fam Zheng , Stefan Hajnoczi , qemu-trivial@nongnu.org, Reda Sallahi img_open_file() and img_open_opts() were printing error messages with a duplicate part because of a wrong use of error_reportf_err() (e.g. qemu-img: Could not open 'foo': Could not open 'foo': No such file or directory) This change uses error_report_err() instead to eliminate the duplicate part. Signed-off-by: Reda Sallahi --- qemu-img.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 2e40e1f..dc6652d 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -268,7 +268,7 @@ static BlockBackend *img_open_opts(const char *optstr, options = qemu_opts_to_qdict(opts, NULL); blk = blk_new_open(NULL, NULL, options, flags, &local_err); if (!blk) { - error_reportf_err(local_err, "Could not open '%s': ", optstr); + error_report_err(local_err); return NULL; } blk_set_enable_write_cache(blk, !writethrough); @@ -295,7 +295,7 @@ static BlockBackend *img_open_file(const char *filename, blk = blk_new_open(filename, NULL, options, flags, &local_err); if (!blk) { - error_reportf_err(local_err, "Could not open '%s': ", filename); + error_report(local_err); return NULL; } blk_set_enable_write_cache(blk, !writethrough); -- 2.9.0