From patchwork Wed Feb 17 15:29:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 8340381 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 39D75C0553 for ; Wed, 17 Feb 2016 15:38:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9541B203B7 for ; Wed, 17 Feb 2016 15:38:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DD44C20357 for ; Wed, 17 Feb 2016 15:38:42 +0000 (UTC) Received: from localhost ([::1]:58741 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW4Be-0004OQ-4b for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Feb 2016 10:38:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60320) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW43N-0007HD-Pw for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:30:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aW43J-0008Lk-P8 for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:30:09 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:20240 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW43J-0008K0-BQ for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:30:05 -0500 Received: from kvm.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u1HFTHCV009256; Wed, 17 Feb 2016 18:29:53 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Date: Wed, 17 Feb 2016 18:29:05 +0300 Message-Id: <1455722949-17060-14-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1455722949-17060-1-git-send-email-vsementsov@virtuozzo.com> References: <1455722949-17060-1-git-send-email-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, famz@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, den@openvz.org, jsnow@redhat.com Subject: [Qemu-devel] [PATCH 13/17] qcow2-dirty-bitmaps: disallow stroing bitmap to other bs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Check, that bitmap is stored to the owning bs. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/dirty-bitmap.c | 12 ++++++++++++ block/qcow2-dirty-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 67f925e..37a910f 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -580,3 +580,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-dirty-bitmap.c b/block/qcow2-dirty-bitmap.c index 189b74b..8e9fd81 100644 --- a/block/qcow2-dirty-bitmap.c +++ b/block/qcow2-dirty-bitmap.c @@ -755,6 +755,11 @@ void qcow2_bitmap_store(BlockDriverState *bs, uint64_t size = bdrv_dirty_bitmap_size(bitmap); int granularity = bdrv_dirty_bitmap_granularity(bitmap); + if (!bdrv_has_dirty_bitmap(bs, bitmap)) { + error_setg(errp, "Can't store bitmap to the other node."); + return; + } + /* find/create dirty bitmap */ bm = find_bitmap_by_name(bs, name); if (bm == NULL) { diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h index 073013d..4f81f0a 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -87,4 +87,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