From patchwork Mon Aug 8 15:05:03 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: 9268559 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0769560754 for ; Mon, 8 Aug 2016 15:19:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC8E426E16 for ; Mon, 8 Aug 2016 15:19:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E097A283FD; Mon, 8 Aug 2016 15:19:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 9214026E16 for ; Mon, 8 Aug 2016 15:19:21 +0000 (UTC) Received: from localhost ([::1]:58047 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWmKm-0003LY-Fj for patchwork-qemu-devel@patchwork.kernel.org; Mon, 08 Aug 2016 11:19:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWm7T-000707-HJ for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bWm7Q-0004SC-2T for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:35 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:28227 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWm7P-0004PR-Jr for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:31 -0400 Received: from kvm.qa.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u77NfZcO001857; Mon, 8 Aug 2016 02:41:37 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Mon, 8 Aug 2016 18:05:03 +0300 Message-Id: <1470668720-211300-13-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1470668720-211300-1-git-send-email-vsementsov@virtuozzo.com> References: <1470668720-211300-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 Subject: [Qemu-devel] [PATCH 12/29] qcow2: add qcow2_delete_bitmaps X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, famz@redhat.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add function to delete dirty bitmaps from image. It will be used in truncate. Signed-off-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Denis V. Lunev --- block/qcow2-bitmap.c | 34 ++++++++++++++++++++++++++++++++++ block/qcow2.h | 1 + 2 files changed, 35 insertions(+) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 0c0cb7c..92d95c5 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -273,6 +273,24 @@ static void do_free_bitmap_clusters(BlockDriverState *bs, QCOW2_DISCARD_ALWAYS); } +static int bitmap_table_load(BlockDriverState *bs, QCow2BitmapHeader *bmh, + uint64_t **table); +static int free_bitmap_clusters(BlockDriverState *bs, QCow2BitmapHeader *bmh) +{ + int ret; + uint64_t *bitmap_table; + + ret = bitmap_table_load(bs, bmh, &bitmap_table); + if (ret < 0 || bitmap_table == NULL) { + return ret; + } + + do_free_bitmap_clusters(bs, bmh->bitmap_table_offset, + bmh->bitmap_table_size, bitmap_table); + + return 0; +} + /* dirty sectors in cluster is a number of sectors in the image, corresponding * to one cluster of bitmap data */ static uint64_t dirty_sectors_in_cluster(const BDRVQcow2State *s, @@ -588,6 +606,22 @@ BdrvDirtyBitmap *qcow2_bitmap_load(BlockDriverState *bs, const char *name, return load_bitmap(bs, h, errp); } +int qcow2_delete_bitmaps(BlockDriverState *bs) +{ + BDRVQcow2State *s = bs->opaque; + QCow2BitmapHeader *h; + + if (s->nb_bitmaps == 0) { + return 0; + } + + for_each_bitmap_header(h, s) { + free_bitmap_clusters(bs, h); + } + + return directory_update(bs, NULL, 0, 0); +} + /* store_bitmap_data() * Store bitmap to image, filling bitamp table accordingly. */ diff --git a/block/qcow2.h b/block/qcow2.h index 87b0a32..0ec0b31 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -612,6 +612,7 @@ BdrvDirtyBitmap *qcow2_bitmap_load(BlockDriverState *bs, const char *name, Error **errp); void qcow2_bitmap_store(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, Error **errp); +int qcow2_delete_bitmaps(BlockDriverState *bs); /* qcow2-cache.c functions */ Qcow2Cache *qcow2_cache_create(BlockDriverState *bs, int num_tables);