From nobody Fri Dec 19 20:42:07 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594245734; cv=none; d=zohomail.com; s=zohoarc; b=DNu6nlPq027zeiMRxF1sEdy2o7anBmq1wSd8WPt7f2VtK0CIf+fz/2DrGyhZvY3mGdaHeOgVMY77Ld1kKyXsMVT6A3tQfjpnkFTVRpMNNqVwLOTG2ekuej973Mqg8fzACd26r5h2Viw3sAeOLEB1HnSHQH/jzFcswul89HOegdU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594245734; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZJGom/vAULnFl6cIacIcHIP4ZK3VoxHKYq8hbSKSQaA=; b=i1ZpbnU2d9m3QQMxzCWSjtALIourdFnVr6WTRzoMMSV1c+gMF6SqmVg6vx/j2OIV1XgrV89ck791Jm00J8Jzzd3nHqD44ySeqablgvnjYCmgKXlYE0BF37MFKnNUVG6kgMbJGvbtmdA2tgwxoH9+IvsBbpuO1Kmcbnlj6fdG3QY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159424573467365.7834595793214; Wed, 8 Jul 2020 15:02:14 -0700 (PDT) Received: from localhost ([::1]:39390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtI8r-0002ig-AG for importer@patchew.org; Wed, 08 Jul 2020 18:02:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtHhi-0007mZ-0j for qemu-devel@nongnu.org; Wed, 08 Jul 2020 17:34:10 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:26727 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtHhg-0002rf-BO for qemu-devel@nongnu.org; Wed, 08 Jul 2020 17:34:09 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-149-DWIepAu6NPWdNv30spyazA-1; Tue, 07 Jul 2020 17:25:15 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 95415107ACCA; Tue, 7 Jul 2020 21:25:14 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 662975C1D0; Tue, 7 Jul 2020 21:25:14 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1F6841144227; Tue, 7 Jul 2020 23:25:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594244047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZJGom/vAULnFl6cIacIcHIP4ZK3VoxHKYq8hbSKSQaA=; b=OPqnpy4cBorvvBrkkfxyYJzhd731Eiolv5JKsTY9pC3cwmVL21Rqe2fL8AaQ2wshSDDSDa 4JsuAXnY7md+qiA9QHHmVq98wGNx4hcYKWf+nfx/TUA94Un0x3f1DjAP9jqWlYhfuAcwcK AAuTV0wjlte9/4hX8+wZ72QRw+MQj84= X-MC-Unique: DWIepAu6NPWdNv30spyazA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 15/53] block: Avoid error accumulation in bdrv_img_create() Date: Tue, 7 Jul 2020 23:24:25 +0200 Message-Id: <20200707212503.1495927-16-armbru@redhat.com> In-Reply-To: <20200707212503.1495927-1-armbru@redhat.com> References: <20200707212503.1495927-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/07 17:25:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" When creating an image fails because the format doesn't support option "backing_file" or "backing_fmt", bdrv_img_create() first has qemu_opt_set() put a generic error into @local_err, then puts the real error into @errp with error_setg(), and then propagates the former to the latter, which throws away the generic error. A bit complicated, but works. Now that qemu_opt_set() returns a useful value, we can simply ignore the generic error instead. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy Message-Id: <20200707160613.848843-16-armbru@redhat.com> --- block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 8d478bdc51..b396f32a51 100644 --- a/block.c +++ b/block.c @@ -6090,7 +6090,7 @@ void bdrv_img_create(const char *filename, const char= *fmt, =20 if (base_filename) { if (!qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, base_filename, - &local_err)) { + NULL)) { error_setg(errp, "Backing file not supported for file format '= %s'", fmt); goto out; @@ -6098,7 +6098,7 @@ void bdrv_img_create(const char *filename, const char= *fmt, } =20 if (base_fmt) { - if (!qemu_opt_set(opts, BLOCK_OPT_BACKING_FMT, base_fmt, &local_er= r)) { + if (!qemu_opt_set(opts, BLOCK_OPT_BACKING_FMT, base_fmt, NULL)) { error_setg(errp, "Backing file format not supported for file " "format '%s'", fmt); goto out; --=20 2.26.2