From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2ewW-0000W7-Sb for qemu-devel@nongnu.org; Mon, 13 Jan 2014 05:40:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W2ewQ-0002Sd-Se for qemu-devel@nongnu.org; Mon, 13 Jan 2014 05:40:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49939) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2ewQ-0002SV-Kg for qemu-devel@nongnu.org; Mon, 13 Jan 2014 05:40:22 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0DAeGR1019275 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 13 Jan 2014 05:40:22 -0500 From: Fam Zheng Date: Mon, 13 Jan 2014 18:39:48 +0800 Message-Id: <1389609588-32104-10-git-send-email-famz@redhat.com> In-Reply-To: <1389609588-32104-1-git-send-email-famz@redhat.com> References: <1389609588-32104-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH 9/9] qapi: Add transaction support to dirty-bitmap-{add, disable} List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com This adds dirty-bitmap-add and dirty-bitmap-disable to transactions. With this, user can stop a dirty bitmap, start backup of it, and start another dirty bitmap atomically, so that the dirty bitmap is tracked incrementally and we don't miss any write. Signed-off-by: Fam Zheng --- blockdev.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qapi-schema.json | 4 +++- 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/blockdev.c b/blockdev.c index 090a681..3a8fbf2 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1335,6 +1335,64 @@ static void drive_backup_abort(BlkTransactionState *common) } } +static void dirty_bitmap_add_prepare(BlkTransactionState *common, Error **errp) +{ + DirtyBitmap *action; + Error *local_err = NULL; + + action = common->action->dirty_bitmap_add; + qmp_dirty_bitmap_add(action->device, action->name, false, 0, &local_err); + if (error_is_set(&local_err)) { + error_propagate(errp, local_err); + } +} + +static void dirty_bitmap_add_abort(BlkTransactionState *common) +{ + DirtyBitmap *action; + BdrvDirtyBitmap *bm; + BlockDriverState *bs; + + action = common->action->dirty_bitmap_add; + bs = bdrv_find(action->device); + if (bs) { + bm = bdrv_find_dirty_bitmap(bs, action->name); + if (bm) { + bdrv_release_dirty_bitmap(bs, bm); + } + } +} + +static void dirty_bitmap_disable_prepare(BlkTransactionState *common, + Error **errp) +{ + DirtyBitmap *action; + Error *local_err = NULL; + + action = common->action->dirty_bitmap_disable; + qmp_dirty_bitmap_disable(action->device, action->name, + false, 0, &local_err); + if (error_is_set(&local_err)) { + error_propagate(errp, local_err); + } +} + +static void dirty_bitmap_disable_abort(BlkTransactionState *common) +{ + DirtyBitmap *action; + BdrvDirtyBitmap *bitmap; + BlockDriverState *bs; + + action = common->action->dirty_bitmap_disable; + bs = bdrv_find(action->device); + if (bs) { + bitmap = bdrv_find_dirty_bitmap(bs, action->name); + if (bitmap) { + bdrv_enable_dirty_bitmap(bs, bitmap); + } + } +} + static void abort_prepare(BlkTransactionState *common, Error **errp) { error_setg(errp, "Transaction aborted using Abort action"); @@ -1367,6 +1425,16 @@ static const BdrvActionOps actions[] = { .prepare = internal_snapshot_prepare, .abort = internal_snapshot_abort, }, + [TRANSACTION_ACTION_KIND_DIRTY_BITMAP_ADD] = { + .instance_size = sizeof(BlkTransactionState), + .prepare = dirty_bitmap_add_prepare, + .abort = dirty_bitmap_add_abort, + }, + [TRANSACTION_ACTION_KIND_DIRTY_BITMAP_DISABLE] = { + .instance_size = sizeof(BlkTransactionState), + .prepare = dirty_bitmap_disable_prepare, + .abort = dirty_bitmap_disable_abort, + }, }; /* diff --git a/qapi-schema.json b/qapi-schema.json index 8a81026..22cf010 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1843,7 +1843,9 @@ 'blockdev-snapshot-sync': 'BlockdevSnapshot', 'drive-backup': 'DriveBackup', 'abort': 'Abort', - 'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternal' + 'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternal', + 'dirty-bitmap-add': 'DirtyBitmap', + 'dirty-bitmap-disable': 'DirtyBitmap' } } ## -- 1.8.5.2