From nobody Wed Nov 12 23:19:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1574686443; cv=none; d=zohomail.com; s=zohoarc; b=hEsCoNVBi4SKC+j5/8TdoHQzEzNyG1aDotxbXdbFrl5wS5U9rfI2pOvZZY5Hv3WAjTYwZ6sarELn/U86IWPXs9iWs42LEMMu0b9DXA57ij6LWeINLs281NCkszLpzDIfoXo88IGPkgAhSsTDT9F9lCC1+k+5aV+9hCkLC7yBqso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574686443; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=B9UDqdfkce3YTR5Vit4NS7V+SXQShgkM8qdKPGY/enw=; b=JgNAm+luGjoivL1SnqC3q5VR8OIUqeIGEfzd1sIkVEk/FJZHRmahAAsJkw9ja1F5evyfH645bmGLKmTgkRc4J8sxx0YYCsbYaQjeymmOGkvkZqhpP/6EgfxDqjfwlE0CZeoA5PLvH/EPQV+WZu2bBk2dSwzsYdwS5EzsBQKmH3w= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574686443541256.63609417748194; Mon, 25 Nov 2019 04:54:03 -0800 (PST) Received: from localhost ([::1]:43278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZDsP-0007KX-Dz for importer@patchew.org; Mon, 25 Nov 2019 07:54:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36883) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZDr6-00068f-Rz for qemu-devel@nongnu.org; Mon, 25 Nov 2019 07:52:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZDr5-0008TU-PZ for qemu-devel@nongnu.org; Mon, 25 Nov 2019 07:52:40 -0500 Received: from relay.sw.ru ([185.231.240.75]:42312) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iZDr3-0008Ox-3w; Mon, 25 Nov 2019 07:52:37 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1iZDqx-0007wx-AU; Mon, 25 Nov 2019 15:52:31 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH 1/2] block/qcow2-bitmap: fix bitmap migration Date: Mon, 25 Nov 2019 15:52:28 +0300 Message-Id: <20191125125229.13531-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191125125229.13531-1-vsementsov@virtuozzo.com> References: <20191125125229.13531-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-stable@nongnu.org, qemu-devel@nongnu.org, mreitz@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Fix bitmap migration with dirty-bitmaps capability enabled and shared storage. We should ignore IN_USE bitmaps in the image on target, when migrating bitmaps through migration channel, see new comment below. Fixes: 74da6b943565c451 Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2-bitmap.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 809bbc5d20..8abaf632fc 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -988,7 +988,26 @@ bool qcow2_load_dirty_bitmaps(BlockDriverState *bs, Er= ror **errp) } =20 QSIMPLEQ_FOREACH(bm, bm_list, entry) { - BdrvDirtyBitmap *bitmap =3D load_bitmap(bs, bm, errp); + BdrvDirtyBitmap *bitmap; + + if ((bm->flags & BME_FLAG_IN_USE) && + bdrv_find_dirty_bitmap(bs, bm->name)) + { + /* + * We already have corresponding BdrvDirtyBitmap, and bitmap i= n the + * image is marked IN_USE. Firstly, this state is valid, no re= ason + * to consider existing BdrvDirtyBitmap to be bad. Secondly it= 's + * absolutely possible, when we do migration with shared stora= ge + * with dirty-bitmaps capability enabled: if the bitmap was lo= aded + * from this storage before migration start, the storage will + * of-course contain IN_USE outdated version of the bitmap, an= d we + * should not load it on migration target, as we already have = this + * bitmap, being migrated. + */ + continue; + } + + bitmap =3D load_bitmap(bs, bm, errp); if (bitmap =3D=3D NULL) { goto fail; } --=20 2.21.0