From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39244) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQz6M-0007rM-5N for qemu-devel@nongnu.org; Thu, 26 Feb 2015 09:07:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQz6E-0007ZQ-FU for qemu-devel@nongnu.org; Thu, 26 Feb 2015 09:07:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37013) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQz6E-0007Z4-7c for qemu-devel@nongnu.org; Thu, 26 Feb 2015 09:07:34 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1QE7Xmi019022 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 26 Feb 2015 09:07:33 -0500 Received: from blackfin.pond.sub.org (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t1QE7VCL026725 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 26 Feb 2015 09:07:32 -0500 From: Markus Armbruster Date: Thu, 26 Feb 2015 15:07:20 +0100 Message-Id: <1424959648-14721-6-git-send-email-armbru@redhat.com> In-Reply-To: <1424959648-14721-1-git-send-email-armbru@redhat.com> References: <1424959648-14721-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 05/13] block: Suppress unhelpful extra errors in bdrv_img_create() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 Reviewed-by: Eric Blake --- 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