From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWm7V-00071q-VJ for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bWm7P-0004Rj-UN for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:37 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:3315 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWm7P-0004QJ-Gf for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:31 -0400 From: Vladimir Sementsov-Ogievskiy Date: Mon, 8 Aug 2016 18:05:09 +0300 Message-Id: <1470668720-211300-19-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1470668720-211300-1-git-send-email-vsementsov@virtuozzo.com> References: <1470668720-211300-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 18/29] qcow2-bitmap: disallow storing bitmap to other bs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org, qemu-devel@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, armbru@redhat.com, eblake@redhat.com, jsnow@redhat.com, famz@redhat.com, den@openvz.org, stefanha@redhat.com, vsementsov@virtuozzo.com, pbonzini@redhat.com Check, that bitmap is stored to the owning bs. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/dirty-bitmap.c | 12 ++++++++++++ block/qcow2-bitmap.c | 5 +++++ include/block/dirty-bitmap.h | 2 ++ 3 files changed, 19 insertions(+) diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 1d0ea25..90ac794 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -613,3 +613,15 @@ BdrvDirtyBitmap *bdrv_load_dirty_bitmap(BlockDriverState *bs, const char *name, } return NULL; } + +bool bdrv_has_dirty_bitmap(BlockDriverState *bs, const BdrvDirtyBitmap *bitmap) +{ + BdrvDirtyBitmap *bm, *next; + QLIST_FOREACH_SAFE(bm, &bs->dirty_bitmaps, list, next) { + if (bm == bitmap) { + return true; + } + } + + return false; +} diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 0e95121..bfc1db8 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -881,6 +881,11 @@ void qcow2_bitmap_store(BlockDriverState *bs, uint32_t table_size; uint64_t *bitmap_table; + if (!bdrv_has_dirty_bitmap(bs, bitmap)) { + error_setg(errp, "Can't store bitmap to the other node."); + return; + } + /* find/create dirty bitmap */ bmh = find_bitmap_by_name(bs, bm_name); if (bmh != NULL) { diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h index d482098..1af3890 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -84,4 +84,6 @@ void bdrv_finalize_persistent_dirty_bitmaps(BlockDriverState *bs); BdrvDirtyBitmap *bdrv_load_dirty_bitmap(BlockDriverState *bs, const char *name, Error **errp); +bool bdrv_has_dirty_bitmap(BlockDriverState *bs, const BdrvDirtyBitmap *bitmap); + #endif -- 1.8.3.1