From nobody Sun Oct 5 19:22:45 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=1615306542; cv=none; d=zohomail.com; s=zohoarc; b=CWlGUkFkOxK4B5MMzFiqlwz2lVW/AanYWnhqzgdX2+ptK6gBJnjbhO3TsPbJfUZ+flewUIZoZhfV9xPnz2g2kvDpRrekk7T5dZlX7MSge5urgex23Ei5cZKHNz6ng84IB6ccTV/IN3DpCUlEYFh71Kiqk8nFQBHLeWUM0qa/3WE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615306542; 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=iPww696638/5Eu07zoAJcw9vrYN0/OZxZobBsyB/dtE=; b=AZKdIlrlxUc9tNtG1r9E5kA/yGcJM5M0eApRvZXCGl2YH/UaVhTh0uwJe2MAYDyT5qVu3rUQq94zjcGFsvR7gUOwubgJS4R1keCv6Fh3IrP2EYB7lwQnakeO+nUpqwLpjyZeZIeVHDsU9G01v9gQso4u8+WvBcPQTwTeF3RFzdc= 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 1615306542245338.8785188585555; Tue, 9 Mar 2021 08:15:42 -0800 (PST) Received: from localhost ([::1]:49544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJf1I-00034w-K0 for importer@patchew.org; Tue, 09 Mar 2021 11:15:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJefC-00047F-Eq for qemu-devel@nongnu.org; Tue, 09 Mar 2021 10:52:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:37872) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lJeew-0000z9-4p for qemu-devel@nongnu.org; Tue, 09 Mar 2021 10:52:49 -0500 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-150-kggvipyeNs2jafVIx08fPQ-1; Tue, 09 Mar 2021 10:52:30 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 75FA557; Tue, 9 Mar 2021 15:52:29 +0000 (UTC) Received: from blue.redhat.com (ovpn-112-36.phx2.redhat.com [10.3.112.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id D62A519C46; Tue, 9 Mar 2021 15:52:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615305152; 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=iPww696638/5Eu07zoAJcw9vrYN0/OZxZobBsyB/dtE=; b=hveJQ2w46RXCThBSuogTlT2Z0bZHi10sEzOQas0NDLqLdqVmzY4FGH0vkIyJ7tbyenBH+I LaHfjLOf1wxbT40DpFaUf6BeUegc6qduvKt4dQ3hTqu93/OXS0MDElvrIzCd0glkSPaS/T vDS4I5dfCVGng7UTrW2hfLenttrtkgQ= X-MC-Unique: kggvipyeNs2jafVIx08fPQ-1 From: Eric Blake To: qemu-devel@nongnu.org Subject: [PULL 11/17] block/qcow2: qcow2_get_specific_info(): drop error propagation Date: Tue, 9 Mar 2021 09:51:56 -0600 Message-Id: <20210309155202.1312571-12-eblake@redhat.com> In-Reply-To: <20210309155202.1312571-1-eblake@redhat.com> References: <20210309155202.1312571-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eblake@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=170.10.133.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.251, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Kevin Wolf , Vladimir Sementsov-Ogievskiy , Alberto Garcia , "open list:qcow2" , Max Reitz , John Snow 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" From: Vladimir Sementsov-Ogievskiy Don't use error propagation in qcow2_get_specific_info(). For this refactor qcow2_get_bitmap_info_list, its current interface is rather weird. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20210202124956.63146-9-vsementsov@virtuozzo.com> Reviewed-by: Alberto Garcia [eblake: separate local 'tail' variable from 'info_list' parameter] Signed-off-by: Eric Blake --- block/qcow2.h | 4 ++-- block/qcow2-bitmap.c | 26 ++++++++++++++------------ block/qcow2.c | 10 +++------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/block/qcow2.h b/block/qcow2.h index 0678073b742f..a6bf2881bba6 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -979,8 +979,8 @@ int qcow2_check_bitmaps_refcounts(BlockDriverState *bs,= BdrvCheckResult *res, void **refcount_table, int64_t *refcount_table_size); bool qcow2_load_dirty_bitmaps(BlockDriverState *bs, Error **errp); -Qcow2BitmapInfoList *qcow2_get_bitmap_info_list(BlockDriverState *bs, - Error **errp); +bool qcow2_get_bitmap_info_list(BlockDriverState *bs, + Qcow2BitmapInfoList **info_list, Error **e= rrp); int qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp); int qcow2_truncate_bitmaps_check(BlockDriverState *bs, Error **errp); void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 5eef82fa55f1..3c9dcaf0a23a 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -1089,30 +1089,32 @@ static Qcow2BitmapInfoFlagsList *get_bitmap_info_fl= ags(uint32_t flags) /* * qcow2_get_bitmap_info_list() * Returns a list of QCOW2 bitmap details. - * In case of no bitmaps, the function returns NULL and - * the @errp parameter is not set. - * When bitmap information can not be obtained, the function returns - * NULL and the @errp parameter is set. + * On success return true with info_list set (note, that if there are no + * bitmaps, info_list is set to NULL). + * On failure return false with errp set. */ -Qcow2BitmapInfoList *qcow2_get_bitmap_info_list(BlockDriverState *bs, - Error **errp) +bool qcow2_get_bitmap_info_list(BlockDriverState *bs, + Qcow2BitmapInfoList **info_list, Error **e= rrp) { BDRVQcow2State *s =3D bs->opaque; Qcow2BitmapList *bm_list; Qcow2Bitmap *bm; - Qcow2BitmapInfoList *list =3D NULL; - Qcow2BitmapInfoList **tail =3D &list; + Qcow2BitmapInfoList **tail; if (s->nb_bitmaps =3D=3D 0) { - return NULL; + *info_list =3D NULL; + return true; } bm_list =3D bitmap_list_load(bs, s->bitmap_directory_offset, s->bitmap_directory_size, errp); - if (bm_list =3D=3D NULL) { - return NULL; + if (!bm_list) { + return false; } + *info_list =3D NULL; + tail =3D info_list; + QSIMPLEQ_FOREACH(bm, bm_list, entry) { Qcow2BitmapInfo *info =3D g_new0(Qcow2BitmapInfo, 1); info->granularity =3D 1U << bm->granularity_bits; @@ -1123,7 +1125,7 @@ Qcow2BitmapInfoList *qcow2_get_bitmap_info_list(Block= DriverState *bs, bitmap_list_free(bm_list); - return list; + return true; } int qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp) diff --git a/block/qcow2.c b/block/qcow2.c index c5266424bb01..289e3dbc9769 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -5066,12 +5066,10 @@ static ImageInfoSpecific *qcow2_get_specific_info(B= lockDriverState *bs, BDRVQcow2State *s =3D bs->opaque; ImageInfoSpecific *spec_info; QCryptoBlockInfo *encrypt_info =3D NULL; - Error *local_err =3D NULL; if (s->crypto !=3D NULL) { - encrypt_info =3D qcrypto_block_get_info(s->crypto, &local_err); - if (local_err) { - error_propagate(errp, local_err); + encrypt_info =3D qcrypto_block_get_info(s->crypto, errp); + if (!encrypt_info) { return NULL; } } @@ -5088,9 +5086,7 @@ static ImageInfoSpecific *qcow2_get_specific_info(Blo= ckDriverState *bs, }; } else if (s->qcow_version =3D=3D 3) { Qcow2BitmapInfoList *bitmaps; - bitmaps =3D qcow2_get_bitmap_info_list(bs, &local_err); - if (local_err) { - error_propagate(errp, local_err); + if (!qcow2_get_bitmap_info_list(bs, &bitmaps, errp)) { qapi_free_ImageInfoSpecific(spec_info); qapi_free_QCryptoBlockInfo(encrypt_info); return NULL; --=20 2.30.1