Received: from eggs.gnu.org ([2001:4830:134:3::10]:39085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afvE1-0000Ay-FU for qemu-devel@nongnu.org; Tue, 15 Mar 2016 16:05:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afvE0-0008Pr-Im for qemu-devel@nongnu.org; Tue, 15 Mar 2016 16:05:53 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:11296 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afvE0-0008Om-0n for qemu-devel@nongnu.org; Tue, 15 Mar 2016 16:05:52 -0400 From: Vladimir Sementsov-Ogievskiy Date: Tue, 15 Mar 2016 23:04:27 +0300 Message-Id: <1458072268-53705-22-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1458072268-53705-1-git-send-email-vsementsov@virtuozzo.com> References: <1458072268-53705-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 21/22] qcow2-dirty-bitmap: add AUTO flag List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 The bitmap should be auto-loaded if auto flag is set. For now, actually, there are no methods to set it. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2-dirty-bitmap.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/block/qcow2-dirty-bitmap.c b/block/qcow2-dirty-bitmap.c index 70c6e36..159e935 100644 --- a/block/qcow2-dirty-bitmap.c +++ b/block/qcow2-dirty-bitmap.c @@ -42,8 +42,9 @@ #define BME_MAX_NAME_SIZE 1023 /* Bitmap directory entry flags */ -#define BME_RESERVED_FLAGS 0xfffffffe +#define BME_RESERVED_FLAGS 0xfffffffc #define BME_FLAG_IN_USE 1 +#define BME_FLAG_AUTO (1U << 1) /* bits [1, 8] U [56, 63] are reserved */ #define BME_TABLE_ENTRY_RESERVED_MASK 0xff000000000001fe @@ -52,6 +53,9 @@ typedef enum BitmapType { BT_DIRTY_TRACKING_BITMAP = 1 } BitmapType; +static BdrvDirtyBitmap *load_bitmap(BlockDriverState *bs, QCow2Bitmap *bm, + Error **errp); + void qcow2_free_bitmaps(BlockDriverState *bs) { BDRVQcow2State *s = bs->opaque; @@ -215,6 +219,13 @@ static int directory_read(BlockDriverState *bs, Error **errp) bm->offset = offset; bm->name = g_strndup((char *)(h + 1), h->name_size); + if (h->flags & BME_FLAG_AUTO) { + load_bitmap(bs, bm, errp); + if (*errp != NULL) { + goto fail; + } + } + offset += dir_entry_size(h); } return 0; -- 1.8.3.1