From nobody Sun Feb 8 03:33:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571081576; cv=none; d=zoho.com; s=zohoarc; b=lG5EjgXHQnvXAjQ8I55hDEXufrjl7M4A8Qp8jj5EYww1b4oQqpOgR5AdoGONd4Y3CkTLp9nAQsHKqKB943WBTPmS1pojN4g+y9noWDNzqbnxxqL6PkBaJFjiOrB7DshYP57FLXrwlqbtXix0q8NDrBRT9m4MD4LeSme6Rc4vWp8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571081576; 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=Xk9pZ3uJ81Zr4geMeC3rTfHbdShHCk/ZeHST2jjSsmY=; b=HOiHfpkhkqfe1yG+eqY54tx98PHVY0bzG01kRl7dm4EfGAEfraLpRnppVXAIPJ0lIb6z3BIpPQumxPSQBlJ/R0hBsU7ZaLY9QhY5F5/mJ+Rs5ZKAu56/lMuk8HMmR5WgsVmDXIWiZA+fiV/YyAXgVueijg6mYqgI/5bOcHIbg84= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1571081576724299.3751282012347; Mon, 14 Oct 2019 12:32:56 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DE8D12DD43; Mon, 14 Oct 2019 19:32:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B7A636061E; Mon, 14 Oct 2019 19:32:54 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 783204EE6E; Mon, 14 Oct 2019 19:32:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9EJTNwQ004295 for ; Mon, 14 Oct 2019 15:29:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 53BF360C5E; Mon, 14 Oct 2019 19:29:23 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-152.bos.redhat.com [10.18.17.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1E7A60BE2; Mon, 14 Oct 2019 19:29:21 +0000 (UTC) From: John Snow To: Peter Maydell , qemu-devel@nongnu.org Date: Mon, 14 Oct 2019 15:28:53 -0400 Message-Id: <20191014192909.16044-4-jsnow@redhat.com> In-Reply-To: <20191014192909.16044-1-jsnow@redhat.com> References: <20191014192909.16044-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Fam Zheng , Kevin Wolf , Vladimir Sementsov-Ogievskiy , qemu-block@nongnu.org, Juan Quintela , libvir-list@redhat.com, John Snow , "Dr. David Alan Gilbert" , Max Reitz , Stefan Hajnoczi Subject: [libvirt] [PULL v2 03/19] block/dirty-bitmap: return int from bdrv_remove_persistent_dirty_bitmap X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 14 Oct 2019 19:32:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy It's more comfortable to not deal with local_err. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: John Snow Message-id: 20190920082543.23444-3-vsementsov@virtuozzo.com Signed-off-by: John Snow --- block/qcow2.h | 5 ++--- include/block/block_int.h | 6 +++--- include/block/dirty-bitmap.h | 5 ++--- block/dirty-bitmap.c | 9 +++++---- block/qcow2-bitmap.c | 18 ++++++++++-------- blockdev.c | 7 +++---- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/block/qcow2.h b/block/qcow2.h index f51f478e34..08b4c15dc4 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -750,9 +750,8 @@ bool qcow2_can_store_new_dirty_bitmap(BlockDriverState = *bs, const char *name, uint32_t granularity, Error **errp); -void qcow2_remove_persistent_dirty_bitmap(BlockDriverState *bs, - const char *name, - Error **errp); +int qcow2_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char = *name, + Error **errp); =20 ssize_t coroutine_fn qcow2_co_compress(BlockDriverState *bs, void *dest, size_t dest_size, diff --git a/include/block/block_int.h b/include/block/block_int.h index 05056b308a..6b511dd889 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -557,9 +557,9 @@ struct BlockDriver { const char *name, uint32_t granularity, Error **errp); - void (*bdrv_remove_persistent_dirty_bitmap)(BlockDriverState *bs, - const char *name, - Error **errp); + int (*bdrv_remove_persistent_dirty_bitmap)(BlockDriverState *bs, + const char *name, + Error **errp); =20 /** * Register/unregister a buffer for I/O. For example, when the driver = is diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h index 4b4b731b46..07503b03b5 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -37,9 +37,8 @@ int bdrv_dirty_bitmap_check(const BdrvDirtyBitmap *bitmap= , uint32_t flags, Error **errp); void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitm= ap); void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs); -void bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs, - const char *name, - Error **errp); +int bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char *= name, + Error **errp); void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap); void bdrv_enable_dirty_bitmap(BdrvDirtyBitmap *bitmap); void bdrv_enable_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap); diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 8f42015db9..d1ae2e1922 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -455,13 +455,14 @@ void bdrv_release_named_dirty_bitmaps(BlockDriverStat= e *bs) * not fail. * This function doesn't release corresponding BdrvDirtyBitmap. */ -void bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs, - const char *name, - Error **errp) +int bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char *= name, + Error **errp) { if (bs->drv && bs->drv->bdrv_remove_persistent_dirty_bitmap) { - bs->drv->bdrv_remove_persistent_dirty_bitmap(bs, name, errp); + return bs->drv->bdrv_remove_persistent_dirty_bitmap(bs, name, errp= ); } + + return 0; } =20 bool bdrv_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *nam= e, diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index b2487101ed..9821c1628f 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -1404,9 +1404,8 @@ static Qcow2Bitmap *find_bitmap_by_name(Qcow2BitmapLi= st *bm_list, return NULL; } =20 -void qcow2_remove_persistent_dirty_bitmap(BlockDriverState *bs, - const char *name, - Error **errp) +int qcow2_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char = *name, + Error **errp) { int ret; BDRVQcow2State *s =3D bs->opaque; @@ -1416,18 +1415,19 @@ void qcow2_remove_persistent_dirty_bitmap(BlockDriv= erState *bs, if (s->nb_bitmaps =3D=3D 0) { /* Absence of the bitmap is not an error: see explanation above * bdrv_remove_persistent_dirty_bitmap() definition. */ - return; + return 0; } =20 bm_list =3D bitmap_list_load(bs, s->bitmap_directory_offset, s->bitmap_directory_size, errp); if (bm_list =3D=3D NULL) { - return; + return -EIO; } =20 bm =3D find_bitmap_by_name(bm_list, name); if (bm =3D=3D NULL) { - goto fail; + ret =3D -EINVAL; + goto out; } =20 QSIMPLEQ_REMOVE(bm_list, bm, Qcow2Bitmap, entry); @@ -1435,14 +1435,16 @@ void qcow2_remove_persistent_dirty_bitmap(BlockDriv= erState *bs, ret =3D update_ext_header_and_dir(bs, bm_list); if (ret < 0) { error_setg_errno(errp, -ret, "Failed to update bitmap extension"); - goto fail; + goto out; } =20 free_bitmap_clusters(bs, &bm->table); =20 -fail: +out: bitmap_free(bm); bitmap_list_free(bm_list); + + return ret; } =20 void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **er= rp) diff --git a/blockdev.c b/blockdev.c index f89e48fc79..a45458a60a 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2940,15 +2940,14 @@ static BdrvDirtyBitmap *do_block_dirty_bitmap_remov= e( } =20 if (bdrv_dirty_bitmap_get_persistence(bitmap)) { + int ret; AioContext *aio_context =3D bdrv_get_aio_context(bs); - Error *local_err =3D NULL; =20 aio_context_acquire(aio_context); - bdrv_remove_persistent_dirty_bitmap(bs, name, &local_err); + ret =3D bdrv_remove_persistent_dirty_bitmap(bs, name, errp); aio_context_release(aio_context); =20 - if (local_err !=3D NULL) { - error_propagate(errp, local_err); + if (ret < 0) { return NULL; } } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list