From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCrpC-0006I7-BH for qemu-devel@nongnu.org; Tue, 14 Jun 2016 13:08:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCrp6-0003V9-BI for qemu-devel@nongnu.org; Tue, 14 Jun 2016 13:08:25 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:40697 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCrp5-0003UZ-Ts for qemu-devel@nongnu.org; Tue, 14 Jun 2016 13:08:20 -0400 From: Vladimir Sementsov-Ogievskiy Date: Tue, 14 Jun 2016 20:08:13 +0300 Message-Id: <1465924093-76875-3-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1465924093-76875-1-git-send-email-vsementsov@virtuozzo.com> References: <1465924093-76875-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 2/2] block: fix libvirt snapshot with existing bitmaps List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: den@openvz.org, vsementsov@virtuozzo.com, kwolf@redhat.com, mreitz@redhat.com Fix the following bug: # virsh start test Domain test started # virsh qemu-monitor-command test \ '{"execute":"block-dirty-bitmap-add",\ "arguments":{"node":"drive0","name":"ab"}}' {"return":{},"id":"libvirt-36"}'}' # virsh snapshot-create test error: Unable to read from monitor: Connection reset by peer Actually, assert "assert(pos < hb->size)" in hbitmap_iter_init fires, because qcow2_save_vmstate just writes to bs (not to bs->file->bs) after the end of the drive. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/dirty-bitmap.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 4902ca5..d28b49c 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -364,6 +364,20 @@ void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors) { BdrvDirtyBitmap *bitmap; + int64_t bitmap_size; + + if (QLIST_EMPTY(&bs->dirty_bitmaps)) { + return; + } + + bitmap_size = QLIST_FIRST(&bs->dirty_bitmaps)->size; + + if (cur_sector >= bitmap_size) { + /* this may come from qcow2_save_vmstate */ + return; + } + assert(cur_sector + nr_sectors <= bitmap_size); + QLIST_FOREACH(bitmap, &bs->dirty_bitmaps, list) { if (!bdrv_dirty_bitmap_enabled(bitmap)) { continue; -- 1.8.3.1