From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtM5D-0003TD-63 for qemu-devel@nongnu.org; Tue, 25 Nov 2014 14:47:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtM56-0004IU-Ms for qemu-devel@nongnu.org; Tue, 25 Nov 2014 14:47:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtM56-0004I3-Ei for qemu-devel@nongnu.org; Tue, 25 Nov 2014 14:47:24 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAPJlN89007095 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 25 Nov 2014 14:47:23 -0500 From: John Snow Date: Tue, 25 Nov 2014 14:46:36 -0500 Message-Id: <1416944800-17919-7-git-send-email-jsnow@redhat.com> In-Reply-To: <1416944800-17919-1-git-send-email-jsnow@redhat.com> References: <1416944800-17919-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [2.3 PATCH v7 06/10] qmp: Add block-dirty-bitmap-enable and block-dirty-bitmap-disable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: John Snow , Fam Zheng From: Fam Zheng 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 Signed-off-by: John Snow --- block.c | 15 +++++++++++++ blockdev.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/block/block.h | 2 ++ qapi/block-core.json | 28 +++++++++++++++++++++++ qmp-commands.hx | 10 +++++++++ 5 files changed, 117 insertions(+) diff --git a/block.c b/block.c index 9582550..7217066 100644 --- a/block.c +++ b/block.c @@ -56,6 +56,7 @@ struct BdrvDirtyBitmap { int64_t size; int64_t granularity; char *name; + bool enabled; QLIST_ENTRY(BdrvDirtyBitmap) list; }; @@ -5361,6 +5362,7 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, bitmap->granularity = granularity; bitmap->bitmap = hbitmap_alloc(bitmap->size, ffs(sector_granularity) - 1); bitmap->name = g_strdup(name); + bitmap->enabled = true; QLIST_INSERT_HEAD(&bs->dirty_bitmaps, bitmap, list); return bitmap; } @@ -5379,6 +5381,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; @@ -5447,6 +5459,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 e2fe687..baaf902 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1873,6 +1873,68 @@ void qmp_block_dirty_bitmap_remove(const char *device, const char *name, bdrv_release_dirty_bitmap(bs, bitmap); } +static BdrvDirtyBitmap *block_dirty_bitmap_lookup(const char *device, + const char *name, + Error **errp) +{ + BlockDriverState *bs; + BdrvDirtyBitmap *bitmap; + Error *local_err = NULL; + + if (!device) { + error_setg(errp, "Device cannot be NULL"); + return NULL; + } + if (!name) { + error_setg(errp, "Bitmap name cannot be NULL"); + return NULL; + } + + bs = bdrv_lookup_bs(device, NULL, &local_err); + if (!bs) { + error_propagate(errp, local_err); + return NULL; + } + + bitmap = bdrv_find_dirty_bitmap(bs, name); + if (!bitmap) { + error_setg(errp, "Dirty bitmap not found: %s", name); + return NULL; + } + + return bitmap; +} + +void qmp_block_dirty_bitmap_enable(const char *device, const char *name, + Error **errp) +{ + BdrvDirtyBitmap *bitmap; + Error *local_err = NULL; + + bitmap = block_dirty_bitmap_lookup(device, name, &local_err); + if (!bitmap) { + error_propagate(errp, local_err); + return; + } + + bdrv_enable_dirty_bitmap(NULL, bitmap); +} + +void qmp_block_dirty_bitmap_disable(const char *device, const char *name, + Error **errp) +{ + BdrvDirtyBitmap *bitmap; + Error *local_err = NULL; + + bitmap = block_dirty_bitmap_lookup(device, name, &local_err); + if (!bitmap) { + error_propagate(errp, local_err); + return; + } + + bdrv_disable_dirty_bitmap(NULL, 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 d1b5c10..b6df2ae 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -440,6 +440,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); int64_t bdrv_dbm_calc_def_granularity(BlockDriverState *bs); int64_t bdrv_dirty_bitmap_granularity(BlockDriverState *bs, diff --git a/qapi/block-core.json b/qapi/block-core.json index 53daf49..46967ac 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -922,6 +922,34 @@ 'data': 'BlockDirtyBitmap' } ## +# @block-dirty-bitmap-enable +# +# Enable a dirty bitmap on the device +# +# 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.3 +## +{'command': 'block-dirty-bitmap-enable', + 'data': 'BlockDirtyBitmap' } + +## +# @block-dirty-bitmap-disable +# +# Disable a dirty bitmap on the device +# +# 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.3 +## +{'command': 'block-dirty-bitmap-disable', + 'data': 'BlockDirtyBitmap' } + +## # @block_set_io_throttle: # # Change I/O throttle limits for a block drive. diff --git a/qmp-commands.hx b/qmp-commands.hx index 5602dcf..8751a06 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1211,6 +1211,16 @@ EQMP .args_type = "device:B,name:s", .mhandler.cmd_new = qmp_marshal_input_block_dirty_bitmap_remove, }, + { + .name = "block-dirty-bitmap-enable", + .args_type = "device:B,name:s", + .mhandler.cmd_new = qmp_marshal_input_block_dirty_bitmap_enable, + }, + { + .name = "block-dirty-bitmap-disable", + .args_type = "device:B,name:s", + .mhandler.cmd_new = qmp_marshal_input_block_dirty_bitmap_disable, + }, SQMP -- 1.9.3