From nobody Mon Apr 29 19:57:54 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1576670161; cv=none; d=zohomail.com; s=zohoarc; b=EJQ2z5m1d0tcAITfrcb854JJhK1jA4ckfS43pwpL1fAs6Q35Of5vVRVPISoHaQD1JTMOxc7Caybx6tGdQeu/DPqxj1q97bm/vP0jxJ/RimjhYy3jTonimoYzlQuDihTAMVZH0kHljLcPZwrevK45U2DLdzun4pRTl8x9Gk9juZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576670161; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=RVoCbPNilFq+Xt5SHYKr54ln2ks+AA1EC9fsW/f0Qpc=; b=dDPdhs4NxCWhrnWD32wiWE+2MRy62XNcADeZTENpETalohbZelXOkwRxL7qco3+sSSZe8JL1yjmJ16vNgJY7qmFPuyfM68cM4pbs5zlcBs4kMyCTwh1jKlrSFAJcg1mzd3KxCRAmbb4zbvKbU2RsgNhzXijLPoQCXQsB28+aKME= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576670161573924.382630348177; Wed, 18 Dec 2019 03:56:01 -0800 (PST) Received: from localhost ([::1]:53086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihXvs-00018w-Gy for importer@patchew.org; Wed, 18 Dec 2019 06:56:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54341) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihXtq-0007nq-TQ for qemu-devel@nongnu.org; Wed, 18 Dec 2019 06:53:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihXtp-0006EP-E2 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 06:53:54 -0500 Received: from smtp.h3c.com ([60.191.123.56]:50602 helo=h3cspam01-ex.h3c.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihXto-0005bg-AM; Wed, 18 Dec 2019 06:53:53 -0500 Received: from DAG2EX05-BASE.srv.huawei-3com.com ([10.8.0.68]) by h3cspam01-ex.h3c.com with ESMTPS id xBIBrVrZ003811 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 18 Dec 2019 19:53:31 +0800 (GMT-8) (envelope-from tu.guoyi@h3c.com) Received: from DAG2EX03-BASE.srv.huawei-3com.com (10.8.0.66) by DAG2EX05-BASE.srv.huawei-3com.com (10.8.0.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 18 Dec 2019 19:53:35 +0800 Received: from DAG2EX03-BASE.srv.huawei-3com.com ([fe80::5d18:e01c:bbbd:c074]) by DAG2EX03-BASE.srv.huawei-3com.com ([fe80::5d18:e01c:bbbd:c074%6]) with mapi id 15.01.1713.004; Wed, 18 Dec 2019 19:53:35 +0800 From: Tuguoyi To: Kevin Wolf , Max Reitz , "qemu-block@nongnu.org" Subject: [PATCH v2] qcow2: Move error check of local_err near its assignment Thread-Topic: [PATCH v2] qcow2: Move error check of local_err near its assignment Thread-Index: AdW1mTSoOOuBNsNvTxeUrz3yzMUMzg== Date: Wed, 18 Dec 2019 11:53:35 +0000 Message-ID: Accept-Language: en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.125.108.112] x-sender-location: DAG2 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-DNSRBL: X-MAIL: h3cspam01-ex.h3c.com xBIBrVrZ003811 X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 60.191.123.56 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: "vsementsov@virtuozzo.com" , "qemu-devel@nongnu.org" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" The local_err check outside of the if block was necessary when it was introduced in commit d1258dd0c87 because it needed to be executed even if qcow2_load_autoloading_dirty_bitmaps() returned false. After some modifications that all required the error check to remain where it is, commit 9c98f145dfb finally moved the qcow2_load_dirty_bitmaps() call into the if block, so now the error check should be there, too. Signed-off-by: Guoyi Tu Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/qcow2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 7c18721..ce3db29 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1705,14 +1705,14 @@ static int coroutine_fn qcow2_do_open(BlockDriverSt= ate *bs, QDict *options, if (!(bdrv_get_flags(bs) & BDRV_O_INACTIVE)) { /* It's case 1, 2 or 3.2. Or 3.1 which is BUG in management layer.= */ bool header_updated =3D qcow2_load_dirty_bitmaps(bs, &local_err); + if (local_err !=3D NULL) { + error_propagate(errp, local_err); + ret =3D -EINVAL; + goto fail; + } =20 update_header =3D update_header && !header_updated; } - if (local_err !=3D NULL) { - error_propagate(errp, local_err); - ret =3D -EINVAL; - goto fail; - } =20 if (update_header) { ret =3D qcow2_update_header(bs); --=20 2.7.4