From patchwork Wed Mar 12 06:31:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 329328 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 02D442C00B8 for ; Wed, 12 Mar 2014 17:34:44 +1100 (EST) Received: from localhost ([::1]:58906 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNckT-0000IW-KQ for incoming@patchwork.ozlabs.org; Wed, 12 Mar 2014 02:34:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNchM-00046D-UR for qemu-devel@nongnu.org; Wed, 12 Mar 2014 02:31:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNchG-0000TU-Ui for qemu-devel@nongnu.org; Wed, 12 Mar 2014 02:31:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64313) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNchG-0000TK-NF for qemu-devel@nongnu.org; Wed, 12 Mar 2014 02:31:22 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2C6VKM3031182 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 12 Mar 2014 02:31:21 -0400 Received: from T430.nay.redhat.com ([10.66.6.152]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s2C6UoeG024513; Wed, 12 Mar 2014 02:31:18 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 12 Mar 2014 14:31:02 +0800 Message-Id: <1394605864-32237-8-git-send-email-famz@redhat.com> In-Reply-To: <1394605864-32237-1-git-send-email-famz@redhat.com> References: <1394605864-32237-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v2 7/9] qmp: Add dirty-bitmap-enable and dirty-bitmap-disable 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This allows to put the dirty bitmap into a disabled state where no more writes will be tracked. It will be used before backup or writing to persistent file. Signed-off-by: Fam Zheng --- block.c | 15 +++++++++++++++ blockdev.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/block/block.h | 2 ++ qapi-schema.json | 32 ++++++++++++++++++++++++++++++++ qmp-commands.hx | 10 ++++++++++ 5 files changed, 103 insertions(+) diff --git a/block.c b/block.c index 199a465..1530fd1 100644 --- a/block.c +++ b/block.c @@ -55,6 +55,7 @@ struct BdrvDirtyBitmap { int64_t size; int64_t granularity; char *name; + bool enabled; QLIST_ENTRY(BdrvDirtyBitmap) list; }; @@ -5120,6 +5121,7 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, if (name) { bitmap->name = g_strdup(name); } + bitmap->enabled = true; QLIST_INSERT_HEAD(&bs->dirty_bitmaps, bitmap, list); return bitmap; } @@ -5138,6 +5140,16 @@ void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap) } } +void bdrv_disable_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap) +{ + bitmap->enabled = false; +} + +void bdrv_enable_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap) +{ + bitmap->enabled = true; +} + BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs) { BdrvDirtyBitmap *bm; @@ -5186,6 +5198,9 @@ void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, { BdrvDirtyBitmap *bitmap; QLIST_FOREACH(bitmap, &bs->dirty_bitmaps, list) { + if (!bitmap->enabled) { + continue; + } hbitmap_set(bitmap->bitmap, cur_sector, nr_sectors); } } diff --git a/blockdev.c b/blockdev.c index 662c950..aa3ee55 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1773,6 +1773,50 @@ void qmp_dirty_bitmap_remove(const char *device, const char *name, bdrv_release_dirty_bitmap(bs, bitmap); } +void qmp_dirty_bitmap_enable(const char *device, const char *name, + bool has_granularity, int64_t granularity, + Error **errp) +{ + BlockDriverState *bs; + BdrvDirtyBitmap *bitmap; + + bs = bdrv_find(device); + if (!bs) { + error_set(errp, QERR_DEVICE_NOT_FOUND, device); + return; + } + + bitmap = bdrv_find_dirty_bitmap(bs, name); + if (!bitmap) { + error_setg(errp, "Dirty bitmap not found: %s", name); + return; + } + + bdrv_enable_dirty_bitmap(bs, bitmap); +} + +void qmp_dirty_bitmap_disable(const char *device, const char *name, + bool has_granularity, int64_t granularity, + Error **errp) +{ + BlockDriverState *bs; + BdrvDirtyBitmap *bitmap; + + bs = bdrv_find(device); + if (!bs) { + error_set(errp, QERR_DEVICE_NOT_FOUND, device); + return; + } + + bitmap = bdrv_find_dirty_bitmap(bs, name); + if (!bitmap) { + error_setg(errp, "Dirty bitmap not found: %s", name); + return; + } + + bdrv_disable_dirty_bitmap(bs, bitmap); +} + int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) { const char *id = qdict_get_str(qdict, "id"); diff --git a/include/block/block.h b/include/block/block.h index 66aae57..2875d7d 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -449,6 +449,8 @@ BdrvDirtyBitmap *bdrv_copy_dirty_bitmap(BlockDriverState *bs, const BdrvDirtyBitmap *bitmap, const char *name); void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap); +void bdrv_disable_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap); +void bdrv_enable_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap); BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs); int bdrv_dirty_bitmap_granularity(BlockDriverState *bs, BdrvDirtyBitmap *bitmap); diff --git a/qapi-schema.json b/qapi-schema.json index 632bb10..f8cd6b8 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2225,6 +2225,38 @@ 'data': { 'device': 'str', 'name': 'str' } } ## +# @dirty-bitmap-enable +# +# Enable a dirty bitmap on the device +# +# Setting granularity has no effect here. +# +# Returns: nothing on success +# If @device is not a valid block device, DeviceNotFound +# If @name is not found, GenericError with an explaining message +# +# Since 2.1 +## +{'command': 'dirty-bitmap-enable', + 'data': 'DirtyBitmap' } + +## +# @dirty-bitmap-disable +# +# Disable a dirty bitmap on the device +# +# Setting granularity has no effect here. +# +# Returns: nothing on success +# If @device is not a valid block device, DeviceNotFound +# If @name is not found, GenericError with an explaining message +# +# Since 2.1 +## +{'command': 'dirty-bitmap-disable', + 'data': 'DirtyBitmap' } + +## # @migrate_cancel # # Cancel the current executing migration process. diff --git a/qmp-commands.hx b/qmp-commands.hx index c42516d..205343b 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1194,6 +1194,16 @@ EQMP .args_type = "device:B,name:s", .mhandler.cmd_new = qmp_marshal_input_dirty_bitmap_remove, }, + { + .name = "dirty-bitmap-enable", + .args_type = "device:B,name:s", + .mhandler.cmd_new = qmp_marshal_input_dirty_bitmap_enable, + }, + { + .name = "dirty-bitmap-disable", + .args_type = "device:B,name:s", + .mhandler.cmd_new = qmp_marshal_input_dirty_bitmap_disable, + }, SQMP