From nobody Fri Nov 14 18:06:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1589546674; cv=pass; d=zohomail.com; s=zohoarc; b=gg7XReTf3r1QPZoMxCiUWQn9i+ilIU/tfiYQsQrz0TBx8h/wCgWdl0/fmMlnrlWURwXEaoQ+3xYgMJQG8C+xs6lpcRIg9cJ2m0+3mIAGcbFDwNpjD7AIUVHMiqKxnlRKLBm9SrlTG6VmZ9bDz3ZSebgDEKC9v64dvvsEe4fnowQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589546674; h=Content-Type: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=w8L1mEFwFjcRzqL8J+Te2vzHwB6npe2ycUNigAGbXEs=; b=U2c4051wrAP/N+KmhZ2NLDSn7CfDD2QQGaDpzrU2blXKR8+NhVEupOkT/F9mPlC63m5HX7eLISeNbhFvzvOv/gTKivC3UYW68NVSZ6WZCU5Ff5Lw8kza+/EJsecfcK/5T0pu4IJQkKH9UiSAhgVJk2be7eE2V95nPN9P60CuQPM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass 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 1589546674344661.5216289431409; Fri, 15 May 2020 05:44:34 -0700 (PDT) Received: from localhost ([::1]:32986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZZhY-0007Zg-S8 for importer@patchew.org; Fri, 15 May 2020 08:44:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZe5-0002Ar-Bn; Fri, 15 May 2020 08:40:57 -0400 Received: from mail-eopbgr150102.outbound.protection.outlook.com ([40.107.15.102]:11310 helo=EUR01-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZe4-0008VJ-7K; Fri, 15 May 2020 08:40:57 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5381.eurprd08.prod.outlook.com (2603:10a6:20b:105::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.26; Fri, 15 May 2020 12:40:51 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%4]) with mapi id 15.20.3000.016; Fri, 15 May 2020 12:40:51 +0000 Received: from kvm.sw.ru (185.215.60.184) by AM0PR03CA0039.eurprd03.prod.outlook.com (2603:10a6:208::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.20 via Frontend Transport; Fri, 15 May 2020 12:40:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PnLuggn/DIDpc+Rc9MOCTDhQfU/VLN2fyyJwU72OObTE2/fwqE/m537v6hf/P3IMAuFNDmISCuyV4DNFZJxPe9ImI4/jX6BqJfLiJSkDn+SYPAoS5k1G1557UAAlO/g9cYz+KyyAsR6ZmBVotECWaWRt18PjVWVONIQY3hlT2gAb0OenQ1jR5uLWVCzpv59wBOH/aVelxx0ROSy+JrNBO+Vy+j6msq67NdL51JbLpOX6+BM+yJ0Ez+U0QNDR2yvDwdZMB5KV4uoynpkwOFIr5SNhmoq2VRl/t5JZg5bkE0hnOtwvfhhMY7z26VgX7oLuCJczBzx2MGstHFjhp9EMWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=w8L1mEFwFjcRzqL8J+Te2vzHwB6npe2ycUNigAGbXEs=; b=GxabazftCSiDihCsyxTj1Xgu2I2IAY2DXY2Y15n00b48y73FYwyYJoHLPt/4VsfyjCpeS3238UYCuG5W8n83mPDnr0fJ8Zb2B+nGHyt/DayoREGpjJBdWmlRqwekeQuE5AjZYGB0Yae6iK1a72q3QCyM/Euq4r71req3bGFx3rlz6Kr9msNdpRCTG/Hf8Fp38k5Rt7jxCdLrqmTJi41tpee8LziPaj9I/6ZChV3f+ZvdOaU3SN41wtOa2IX+smdoQKgDcChwjloKHYAU1nnxY3o7WoWgKVC81LNeh7YOt5HpoPAd9CDBk1tfHDWZ/8zkHrMFbn4E0PjWxienEjDb3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=w8L1mEFwFjcRzqL8J+Te2vzHwB6npe2ycUNigAGbXEs=; b=AswDY8/sK5s2INExW55YFayYABj2IfRQfRbwl/NUVk3jnzMNckR7BVq71pI7ZTKm5u6NLChl9p1b/OVCqc6d6fCEPxeUI9UGmbA6nirG+vrvseuX0DWKt8fDxN94fcwmjud/qtLmu12EYtT82DNEPcpCJJxpr/cddb5mXl99Vrs= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v3 1/7] block: Mark commit, mirror, blkreplay as filters Date: Fri, 15 May 2020 15:40:18 +0300 Message-Id: <20200515124024.3491-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200515124024.3491-1-vsementsov@virtuozzo.com> References: <20200515124024.3491-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR03CA0039.eurprd03.prod.outlook.com (2603:10a6:208::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.184] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 96c2e4c3-4935-482a-2806-08d7f8cd336c X-MS-TrafficTypeDiagnostic: AM7PR08MB5381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:33; X-Forefront-PRVS: 04041A2886 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +rVcYCc0CoiCTK0KOZ6f0ie95GqBOy0ezZn42VxsUqn4j/Qugz4PZ26oxMXOszRLTgq2V0Xo7oqAi3Iu/jJfkmfN841VAG+HLOZVJ0l2GITa5WS49IF5qIYxLn7SSrZ+tiOBXGp5U+d4Lk4bFkvaHp5Gsf7PKW4rXrmREnJvKIrgqfA3lPl/S6N9RO/YX3gBTzk+VzLSr4oCu0QYDn7QcBvfSzPLS+R5bUgyQ+KkRuFv2VDtdaO+q7KdZQGfE8LumAa5g/cphX0TQIbH6h/WdDbbzaehDHRrFemcTYxtsQ8WsUjKATbJZomUjFzKAk2o0YDhNGtO6BaodVS2T9ZID+yJ6/Mt3t7MEwIlcJd8d9JuFKPXW2NLxylhx3jtcqOCxW8BLT1qZd5uClCc+7m/nAvVZEOzJ/L5Myu1z9Ho6QDNxpzjWnwbgpLFb2aBdgvt X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(366004)(376002)(136003)(346002)(396003)(39840400004)(52116002)(6486002)(36756003)(8676002)(7416002)(8936002)(6916009)(478600001)(6666004)(86362001)(6512007)(4326008)(316002)(26005)(5660300002)(16526019)(186003)(6506007)(2616005)(2906002)(1076003)(956004)(66556008)(66946007)(66476007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: lO/EcPi7p9azvQUuFxzLaYkUn6KmvC15bwg0G7H0D59lR1VyWtbc5fNZTk5ZpZhd1R1SQHeX01RRjiBId4p3wHJCionhSKq5lUG4fUjyf4zyiaEpFVRNSU/xJzJszO5/jnf+Efxp4H7CKnhKTLIMagfs1GwEsvPvLkW7mfm/HVQNBowW5wmVLSS/3np0UyfQs707DN2vqSOkKAEoL+0LVJttVqHA308XC2VzJoCS0NldH1g+5Ho7VoBZFQS2eqp4uunjNiv6KJSkn49fn1y7i5fXue6QT3u+8xCG9iSyV69byuExxzFQ43ftI0J9+ViZ9hjdCrMb3iFs3Jlq+elx9lws6r03HgPn3kkwKipjr3m9tu317WLaJyh2pw8O7/5lMTsEgrJsdyZXg6rRDP7O2drTGWrSUHToiabxS5GKHE8lk/0uMojuXOOHilod1MhNa70U3GnLGqBf3/YbREGrge4WKNC3jP/EwktPPVhrL8lNq/WVPx4KxWKRB2TnXRp7 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96c2e4c3-4935-482a-2806-08d7f8cd336c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2020 12:40:51.2378 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OAxxAU3l+lXUcE2biLv0fopK/Sy37ZD6bX2o76xsi7ddx8BquJAwEDxAy1dyNqL6fTe3w9i83zY6j7FSKlI9/ndGqpeGxWKDj1BnzPVFUDQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5381 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; Received-SPF: pass client-ip=40.107.15.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-DB5-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/15 08:40:51 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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, fam@euphon.net, vsementsov@virtuozzo.com, stefanha@redhat.com, quintela@redhat.com, qemu-devel@nongnu.org, dgilbert@redhat.com, mreitz@redhat.com, pavel.dovgaluk@ispras.ru, den@openvz.org, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" From: Max Reitz The commit, mirror, and blkreplay block nodes are filters, so they should be marked as such. Signed-off-by: Max Reitz --- block/blkreplay.c | 1 + block/commit.c | 2 ++ block/mirror.c | 2 ++ 3 files changed, 5 insertions(+) diff --git a/block/blkreplay.c b/block/blkreplay.c index c96ac8f4bc..131c9e8477 100644 --- a/block/blkreplay.c +++ b/block/blkreplay.c @@ -135,6 +135,7 @@ static int blkreplay_snapshot_goto(BlockDriverState *bs, static BlockDriver bdrv_blkreplay =3D { .format_name =3D "blkreplay", .instance_size =3D 0, + .is_filter =3D true, =20 .bdrv_open =3D blkreplay_open, .bdrv_child_perm =3D bdrv_filter_default_perms, diff --git a/block/commit.c b/block/commit.c index 87f6096d90..445a28069b 100644 --- a/block/commit.c +++ b/block/commit.c @@ -240,6 +240,8 @@ static BlockDriver bdrv_commit_top =3D { .bdrv_co_block_status =3D bdrv_co_block_status_from_backing, .bdrv_refresh_filename =3D bdrv_commit_top_refresh_filename, .bdrv_child_perm =3D bdrv_commit_top_child_perm, + + .is_filter =3D true, }; =20 void commit_start(const char *job_id, BlockDriverState *bs, diff --git a/block/mirror.c b/block/mirror.c index aca95c9bc9..b6de24bc3c 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1527,6 +1527,8 @@ static BlockDriver bdrv_mirror_top =3D { .bdrv_co_block_status =3D bdrv_co_block_status_from_backing, .bdrv_refresh_filename =3D bdrv_mirror_top_refresh_filename, .bdrv_child_perm =3D bdrv_mirror_top_child_perm, + + .is_filter =3D true, }; =20 static BlockJob *mirror_start_job( --=20 2.21.0 From nobody Fri Nov 14 18:06:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1589546555; cv=pass; d=zohomail.com; s=zohoarc; b=C+nZ5SfI/UMX/ab6nosmW7NC24tkYPKA+VNL7vpos2AYoBZWF2e7NPV1nPOMpcRPzdHZRELXTopq3S7KfjK0JRkvQByaGFzKFCjQgks8jkvixEpszf/CfNDZ5VJc7cCvaBdkidzuJl2x1DrKsbIG1Lksf+J1wBbyAkmE0s2Zokg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589546555; h=Content-Type: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=+lip4dD19i4EOeKiQ0LX1sMJZbgdXQCeU57yRCNf1Zk=; b=ZVX13AIvQmyqg9aZ0y7XobEClrCM5FXAmVJz35tRM/RAFIbP+E51hrXukBuJROule7enONsMqf2SmawCIWgKyTUh58nSgbXdsEfinauKXs/Dhy18A5xBy84HXq4ysX+RK9vb4bOEFy6sR+mAuvpcWdCtz3l94YTUY9wmS60DocM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass 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 1589546555749275.88320295580854; Fri, 15 May 2020 05:42:35 -0700 (PDT) Received: from localhost ([::1]:53414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZZfe-0004Pa-A8 for importer@patchew.org; Fri, 15 May 2020 08:42:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZe6-0002Db-QO; Fri, 15 May 2020 08:40:58 -0400 Received: from mail-eopbgr150102.outbound.protection.outlook.com ([40.107.15.102]:11310 helo=EUR01-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZe5-0008VJ-Rz; Fri, 15 May 2020 08:40:58 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5381.eurprd08.prod.outlook.com (2603:10a6:20b:105::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.26; Fri, 15 May 2020 12:40:52 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%4]) with mapi id 15.20.3000.016; Fri, 15 May 2020 12:40:52 +0000 Received: from kvm.sw.ru (185.215.60.184) by AM0PR03CA0039.eurprd03.prod.outlook.com (2603:10a6:208::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.20 via Frontend Transport; Fri, 15 May 2020 12:40:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LYKYxOeWLyv6ll0nB6pMACAzzoBYyvmJFEOFFGD7kptvcTy7xOql/WApkjDMGOOcwph+h79wk9dGiY5l4OuwctlOi94XVbnwT3cqZpQ/EsXMEXQJpUcLaKV/qxTDspI6/5J0TD5wt9FX+3i2GSwfReYizUQqSQXA8EmUkIUJD0YFqDAwPgGZqM4SXaolCxNLDacCBvKvcl4r6qCCsTScNoDKXBDLjKN3l5MPVSfx1gMClv/CVkn/4JsaTkSJKyqZOfyX+b8zYk1Dt7H2er7Y8+cCNraipwsYSu2//AztXBS3Mzpy6fCUvMiAGWkGBi6Z49UPA/2KU72h7051Ak/rbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+lip4dD19i4EOeKiQ0LX1sMJZbgdXQCeU57yRCNf1Zk=; b=H6kcWI6DMH67Rt6cyL9No7s+QwFYhL01h/j8TTcOXeMQuJ3VMgcfB/tyRicvuotBU7G5raPetW7kNUqCBT3E+XJOks9fitll1Z5uBhNSy1NyplfV1fOPTMq+lgOsfObFJZwz67wzYDAjuuVbQ9+nldh5b9ejL2wsOXRD6plPSj9XpFWBq8LlYeaElkqP+UY+O0nUYP9c9+qWE4RuH5iFqIJyXUrcP5A9ti8cjW2a+NZsjWvQ6ubLwPbxC/4XmKWgIoDc7C/qdhOdZMOsMEYI0Kj+dIdOERRrX/4RrwVid7JmhGGiXIEzUTsojVpvGvURboLxp76emgafNpV3fuhGbQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+lip4dD19i4EOeKiQ0LX1sMJZbgdXQCeU57yRCNf1Zk=; b=T4Zwm24U9wTR7X5YdLgpNUMc2N8hkpz4CeveyGJyabG5cqSzf/BgRE0b0p4Np6gCPfcSJsn4M6B+cinT90QctInNnvnJZBIdaA65MODJA7laBpctAMM1IfJn3GNLmjIIYVbBIALzEfQ8bx1xFjyySTGzvKilDREFSTnJRRlg8jA= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v3 2/7] migration/block-dirty-bitmap: refactor init_dirty_bitmap_migration Date: Fri, 15 May 2020 15:40:19 +0300 Message-Id: <20200515124024.3491-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200515124024.3491-1-vsementsov@virtuozzo.com> References: <20200515124024.3491-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR03CA0039.eurprd03.prod.outlook.com (2603:10a6:208::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.184] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f75b569d-4be8-4bfe-a463-08d7f8cd3420 X-MS-TrafficTypeDiagnostic: AM7PR08MB5381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3; X-Forefront-PRVS: 04041A2886 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oKfIYxvdmBhvscV+AMVf0P2T8wr711hUwmcWXc8n85Fq+kOE0Ai8O80yFPsHL7ChFrML8q/L7K4NUGcOQG+LjZjAlDWgGIsv+SeQ4fGIJlg4uq+GXB45BrydhVJrJoKMlFFGdgfT3s2fHqtZWWEJSzRhvALxe6GLn9g8UgY96KMWYOlDxi58hh/GiBZW9xM+Gp8qlqcqwLTUX8DHfX9w5PNGUyWBNvlYmj9cpfxIrH67dsO9/etqXwOA9+meGk5ztldPKXDWo8WFZDDhgbVQZf9tJLqJqugtk2TrPxqt42YNfgtjHqZ+/S3yte50eFBnXxViXmx+TOcPh7+DlnBbezlvlLflEsIpEmlLDo+nUVYCC9wk48UP4D2paPp4nNjXqhjbqcOlmyzDH/+lg/6Kjujyvf3xEd7gYpCiht9ANrVgQQ5xOJeTUM+FR2caf2Ve8p5203rHFkpswoTBOMOhOpxa1LfwtQ0AZBUq3IQxJjm4fHwDQoBsaNyV9yB//p5M X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(366004)(376002)(136003)(346002)(396003)(39840400004)(52116002)(6486002)(36756003)(8676002)(7416002)(8936002)(6916009)(478600001)(6666004)(86362001)(6512007)(4326008)(316002)(26005)(5660300002)(16526019)(186003)(6506007)(2616005)(2906002)(1076003)(956004)(66556008)(66946007)(66476007)(14143004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: vtHkac0bidE7jkbZpqIhOSouwJZ7M9Lc1j8Sbw0Mu8IiATkhp2JV2nePCXN3ml9+kFXwm/o62jMlSonh3yXiG4Kv0GZYAm3eUQDTWcu4tvPLuvlj1sbNupjapEGrLaMT3zS9dTJmKR+92KnF4gc30QO5xuQFoFdXTqQeof/DUzcSlfZH/8lUessoe1uj0dTUFtZ1jhOGUDStjCel3xILRBkcvUq3XSRdET9DPzYv/S/Zv//vhBQQkacvVQKuyufBaL6uBqCVr1tw/jf9s2pqDC12SaKo/oLoDaewKBepkAO+gPBpkMyUM5mTQV3khL/WvC3V75Ayk9WSiaZAx40Amp/LQIX548bOLhfx/VrOWoUh7rcoCTNlE8300gmQ3MPQN6tmCSjz1+h+Ya5Z6ln1HzEEHRP50Jjo1/BfjM+cyLAXjavMExV9BBgc56pCJPmsRbtmAhd3vq21Z9CJfhv2aQRWsCPapmlRRXpPfWXyty8= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: f75b569d-4be8-4bfe-a463-08d7f8cd3420 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2020 12:40:52.4176 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1clq4Ii7Qyw335WgmHyG/WmPVEazqq2wqNIy83EtrOYkKzl3svHDEBYCdjD44Td7jiD5E7nZ/X0grvCK/mllIDsc+EURrSAGJ1W6diC0xKc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5381 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; Received-SPF: pass client-ip=40.107.15.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-DB5-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/15 08:40:51 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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, fam@euphon.net, vsementsov@virtuozzo.com, stefanha@redhat.com, quintela@redhat.com, qemu-devel@nongnu.org, dgilbert@redhat.com, mreitz@redhat.com, pavel.dovgaluk@ispras.ru, den@openvz.org, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Split out handling one bs, it is needed for the following commit, which will handle BlockBackends separately. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- migration/block-dirty-bitmap.c | 89 +++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 40 deletions(-) diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index 7eafface61..7e93718086 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -268,57 +268,66 @@ static void dirty_bitmap_mig_cleanup(void) } =20 /* Called with iothread lock taken. */ -static int init_dirty_bitmap_migration(void) +static int add_bitmaps_to_list(BlockDriverState *bs, const char *bs_name) { - BlockDriverState *bs; BdrvDirtyBitmap *bitmap; DirtyBitmapMigBitmapState *dbms; Error *local_err =3D NULL; =20 - dirty_bitmap_mig_state.bulk_completed =3D false; - dirty_bitmap_mig_state.prev_bs =3D NULL; - dirty_bitmap_mig_state.prev_bitmap =3D NULL; - dirty_bitmap_mig_state.no_bitmaps =3D false; + FOR_EACH_DIRTY_BITMAP(bs, bitmap) { + if (!bdrv_dirty_bitmap_name(bitmap)) { + continue; + } =20 - for (bs =3D bdrv_next_all_states(NULL); bs; bs =3D bdrv_next_all_state= s(bs)) { - const char *name =3D bdrv_get_device_or_node_name(bs); + if (!bs_name || strcmp(bs_name, "") =3D=3D 0) { + error_report("Found bitmap '%s' in unnamed node %p. It can't " + "be migrated", bdrv_dirty_bitmap_name(bitmap), bs= ); + return -1; + } =20 - FOR_EACH_DIRTY_BITMAP(bs, bitmap) { - if (!bdrv_dirty_bitmap_name(bitmap)) { - continue; - } + if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, &local_er= r)) { + error_report_err(local_err); + return -1; + } =20 - if (!name || strcmp(name, "") =3D=3D 0) { - error_report("Found bitmap '%s' in unnamed node %p. It can= 't " - "be migrated", bdrv_dirty_bitmap_name(bitmap)= , bs); - goto fail; - } + bdrv_ref(bs); + bdrv_dirty_bitmap_set_busy(bitmap, true); + + dbms =3D g_new0(DirtyBitmapMigBitmapState, 1); + dbms->bs =3D bs; + dbms->node_name =3D bs_name; + dbms->bitmap =3D bitmap; + dbms->total_sectors =3D bdrv_nb_sectors(bs); + dbms->sectors_per_chunk =3D CHUNK_SIZE * 8 * + bdrv_dirty_bitmap_granularity(bitmap) >> BDRV_SECTOR_BITS; + if (bdrv_dirty_bitmap_enabled(bitmap)) { + dbms->flags |=3D DIRTY_BITMAP_MIG_START_FLAG_ENABLED; + } + if (bdrv_dirty_bitmap_get_persistence(bitmap)) { + dbms->flags |=3D DIRTY_BITMAP_MIG_START_FLAG_PERSISTENT; + } =20 - if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, - &local_err)) { - error_report_err(local_err); - goto fail; - } + QSIMPLEQ_INSERT_TAIL(&dirty_bitmap_mig_state.dbms_list, + dbms, entry); + } =20 - bdrv_ref(bs); - bdrv_dirty_bitmap_set_busy(bitmap, true); - - dbms =3D g_new0(DirtyBitmapMigBitmapState, 1); - dbms->bs =3D bs; - dbms->node_name =3D name; - dbms->bitmap =3D bitmap; - dbms->total_sectors =3D bdrv_nb_sectors(bs); - dbms->sectors_per_chunk =3D CHUNK_SIZE * 8 * - bdrv_dirty_bitmap_granularity(bitmap) >> BDRV_SECTOR_BITS; - if (bdrv_dirty_bitmap_enabled(bitmap)) { - dbms->flags |=3D DIRTY_BITMAP_MIG_START_FLAG_ENABLED; - } - if (bdrv_dirty_bitmap_get_persistence(bitmap)) { - dbms->flags |=3D DIRTY_BITMAP_MIG_START_FLAG_PERSISTENT; - } + return 0; +} + +/* Called with iothread lock taken. */ +static int init_dirty_bitmap_migration(void) +{ + BlockDriverState *bs; + DirtyBitmapMigBitmapState *dbms; + + dirty_bitmap_mig_state.bulk_completed =3D false; + dirty_bitmap_mig_state.prev_bs =3D NULL; + dirty_bitmap_mig_state.prev_bitmap =3D NULL; + dirty_bitmap_mig_state.no_bitmaps =3D false; =20 - QSIMPLEQ_INSERT_TAIL(&dirty_bitmap_mig_state.dbms_list, - dbms, entry); + for (bs =3D bdrv_next_all_states(NULL); bs; bs =3D bdrv_next_all_state= s(bs)) { + if (add_bitmaps_to_list(bs, bdrv_get_device_or_node_name(bs))) { + goto fail; } } =20 --=20 2.21.0 From nobody Fri Nov 14 18:06:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1589546549; cv=pass; d=zohomail.com; s=zohoarc; b=DC3HWRGn0YW68GB+KkQtGQ3HndG0Ib4prcnEzdmroMDqqmAqmN1XmDtOxkTImz9XeOm5+ihKVt4VppL6xODu+w23hhyIdBZ/iliWsrNoH5L+EcYlqAgJLosdo/Ap9qVtb83BDRjAYUpxyRPcDZ8Chpixit0HtIK5uqxHtf7qY30= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589546549; h=Content-Type: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=2j3vYlF8ouVHCyr0TlU8c2rQmh/Y1bVh8akJN12+3SE=; b=fU9QSFbh+pVWAPUj4/7TtiK/vJajcHORA5Z+azRV3UderaJZxSDixgBEOJRti2zmxzochOWBbGjJkSwUBGVY12mDImEPgnVkO8ri6KFNjbCkUyQ25aiEmLvK3QbvHaQXww4oKynhT0G/px/K6xUoiAGbs4mX1p7MFuL46rkY4ec= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass 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 1589546548864120.94493604922195; Fri, 15 May 2020 05:42:28 -0700 (PDT) Received: from localhost ([::1]:52758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZZfX-00048Q-At for importer@patchew.org; Fri, 15 May 2020 08:42:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZe8-0002GH-6W; Fri, 15 May 2020 08:41:00 -0400 Received: from mail-eopbgr150102.outbound.protection.outlook.com ([40.107.15.102]:11310 helo=EUR01-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZe7-0008VJ-C2; Fri, 15 May 2020 08:40:59 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5381.eurprd08.prod.outlook.com (2603:10a6:20b:105::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.26; Fri, 15 May 2020 12:40:54 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%4]) with mapi id 15.20.3000.016; Fri, 15 May 2020 12:40:54 +0000 Received: from kvm.sw.ru (185.215.60.184) by AM0PR03CA0039.eurprd03.prod.outlook.com (2603:10a6:208::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.20 via Frontend Transport; Fri, 15 May 2020 12:40:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GPxYtKYD3wTT0zxzP5qJbw7b5HNHdexxrKywFZZ3L4odM5dHlzNgbYnCdzSrjEpS7/ZED1J29rsgsP5gJm/YuqHM6q7OlH3JYdTfFLXx4oUsegk15Dq6D8eFswNMDyOmqBprBleWM3T8wNgYRVN3oaLQw01nJhRLhJzbwQdPAgdANzAnrJ7Hnqmrv0y4LpE1bHSLdjnGWVmmPqqfWFv9fuhZMaif+mChwfS7x0pxt4/X9QCZ2J09D6I9eULUPhzogqFyNpDYzSUgWdL9a2Ko2DgE5rra6FdY/oMFgi8boJMG1/JgcfmDQrfNwhAEWUhnGjMUez4z1WbDhIGpC5YK/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2j3vYlF8ouVHCyr0TlU8c2rQmh/Y1bVh8akJN12+3SE=; b=EFxrDHdOqP9nyjUjvCzN6/SJFxeVBIJM5nIRMdHR2XKGW/j5AenuppkOJBYgSfSx+XFD4VqDAyrITgZiWhEX8DfIpycH/CLTHzLhnCEkWWP3MgspNtBEdLfDTb2dnZB5SLRqg6oBSp8D0RuY8d4FPOe5ue0osyYAC9BO99i7Egy5CXlXIK1MXJrYt/jyXUoQh0Rv5wtSWznudXcgxkS3GYruKyrWQxdW4JcbJQoklkcRryhFPLRw8GlsXs2v8C0oRu4FRkHOzd+RrdVA63UQeIR77mgaxZ9IKPzeoY4uNiHWZv5KvUckvT1vAujgVGLGn9Wg+psHhKTiXBMorNcKWw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2j3vYlF8ouVHCyr0TlU8c2rQmh/Y1bVh8akJN12+3SE=; b=EH6ktoqvvGJcXzQStlGQPh53BPY6AzuC01YeoIGZe5CkcWXiyyLAK6ImB1Yfx2hCQQawN704ZfYgfXY10kUuElhky0e4NAUqUCvBVbbR1/Q9OJDEsRTKf4SjloPISVmJOMpQYsVSkCdWIEz4ePCF9FkHVPhklLhMQCp8Mm8QRus= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v3 3/7] block/dirty-bitmap: add bdrv_has_named_bitmaps helper Date: Fri, 15 May 2020 15:40:20 +0300 Message-Id: <20200515124024.3491-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200515124024.3491-1-vsementsov@virtuozzo.com> References: <20200515124024.3491-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR03CA0039.eurprd03.prod.outlook.com (2603:10a6:208::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.184] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 563e9b7c-29ce-4daf-35f6-08d7f8cd34ff X-MS-TrafficTypeDiagnostic: AM7PR08MB5381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:18; X-Forefront-PRVS: 04041A2886 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D5cli5e+nbm+RqnpoT9JYlnexO2ic38so+vOmWN+M3+VFKOUWoC6F2jJ1cQL705MufJLNQaVk3Irn25+wlqWAnucImdqVqQvOTyuT8oNg/qbOPJmbt6aEsxZZ6G3W9p4mqOc3McJ9TFZ7x0KB45vLovA2JGM2uFaXEu4Nxn7ei46wtlvE+K+rnOl+TwARMepFakFgpfJcPPxMJiguPfk1WFWxcngKP5cY9iK8zBnmCksPmeJ9FAJV4XZYfGlVycBXilPZdnNSqzsFlvD+O7L0gwiubug+Dh0qPAGNEzRvvlcSXjUHR3WdG8//LR9/tllTQbwowsuX1mctZ3rqtPRs2jv40PstMPks7Y58R/BYjhapZaKsehgoZKSDM0U/BOvNhb4UBVfrZOEfmqDqNIlE3Lm5kSdNRX306kt323Db8mzfw2Fgqgvxal9wIc3opQX1dcelwfQmxGYdLCu8YGximiD8maZ1qXkz8s1Oyqj7SpyiQrXgo+8zwI12zKRKVPp X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(366004)(376002)(136003)(346002)(396003)(39840400004)(52116002)(6486002)(36756003)(8676002)(7416002)(8936002)(6916009)(478600001)(6666004)(86362001)(6512007)(4326008)(316002)(107886003)(26005)(5660300002)(16526019)(186003)(6506007)(2616005)(2906002)(1076003)(956004)(66556008)(66946007)(66476007)(14143004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: Mzx3wQ/DZv9mb3oJxwp0LVogn3y4lhIz9YLSRPZvN/5u+thBNEtCbFQHZ4Ai0PQP41DY3qqAibmwO2mtXRrFyCaVCrW8KSnbf0z54AtwAK4Qz/U8QeKSM7qSVtYy7rXPJNu6XSdbP6XhE1SbU0TM+iyH6VySO/9ySDIhboG1eyzSnCU3RgiKlVjQzKmibtnxSmvu6gIRjEJ4winehr+cJjo1C67N2oaa47ZBEIAflBsb6cKtMZ5e2GJ/sUwIjUmnUdGyX0kXBV6zqpkqkLi1y6xxT6WYGzfpPdW315BVuXQ1boBt+V9J+ET+FWKlj++Ar1tWrsLJRQ5dXIFANnN6ONjGlmRi/F1nGZ7ncuQh9G27vkvasdm7nHfN/RT0NfaObBJbyWFDq9Jnvpl3hiCnkb7h8+lS+Bu2hwBVEOTBKqMu1SJiFaOnvCNz643/B5lPCMgRf5ODpdRJHu6qoKrLvbmPmZLtmRT3U3p21sbM3u8= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 563e9b7c-29ce-4daf-35f6-08d7f8cd34ff X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2020 12:40:53.9031 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WnymRgIWMWOrpTlaPFY6Eiu1nO4aQA09jWQKUL26HjqbDyBwVFxEU78i4WPjm+87CyFNguFiqJHPd9z3CdPLEPTR3TZb/wJNAh2av6GdXCo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5381 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; Received-SPF: pass client-ip=40.107.15.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-DB5-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/15 08:40:51 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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, fam@euphon.net, vsementsov@virtuozzo.com, stefanha@redhat.com, quintela@redhat.com, qemu-devel@nongnu.org, dgilbert@redhat.com, mreitz@redhat.com, Andrey Shinkevich , pavel.dovgaluk@ispras.ru, den@openvz.org, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" To be used for bitmap migration in further commit. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Andrey Shinkevich Reviewed-by: Eric Blake --- include/block/dirty-bitmap.h | 1 + block/dirty-bitmap.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h index 8a10029418..eee70df873 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -94,6 +94,7 @@ int64_t bdrv_get_dirty_count(BdrvDirtyBitmap *bitmap); void bdrv_dirty_bitmap_truncate(BlockDriverState *bs, int64_t bytes); bool bdrv_dirty_bitmap_readonly(const BdrvDirtyBitmap *bitmap); bool bdrv_has_readonly_bitmaps(BlockDriverState *bs); +bool bdrv_has_named_bitmaps(BlockDriverState *bs); bool bdrv_dirty_bitmap_get_autoload(const BdrvDirtyBitmap *bitmap); bool bdrv_dirty_bitmap_get_persistence(BdrvDirtyBitmap *bitmap); bool bdrv_dirty_bitmap_inconsistent(const BdrvDirtyBitmap *bitmap); diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 063793e316..c788ca7c69 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -809,6 +809,19 @@ bool bdrv_has_readonly_bitmaps(BlockDriverState *bs) return false; } =20 +bool bdrv_has_named_bitmaps(BlockDriverState *bs) +{ + BdrvDirtyBitmap *bm; + + QLIST_FOREACH(bm, &bs->dirty_bitmaps, list) { + if (bdrv_dirty_bitmap_name(bm)) { + return true; + } + } + + return false; +} + /* Called with BQL taken. */ void bdrv_dirty_bitmap_set_persistence(BdrvDirtyBitmap *bitmap, bool persi= stent) { --=20 2.21.0 From nobody Fri Nov 14 18:06:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1589546571; cv=pass; d=zohomail.com; s=zohoarc; b=f8Uv+g4w6adlAsNmvGEdtYR08E+0Tz02TwUC/LmssQWK+09UkMIbAMwB1Gk5yYA6iCnC/HRpQvnnznXtOh17kEKkRt6gG9cxHtlErwMbxedJZ+jMaj2g+OahddGOMYl1xG8NBMNJwilJjBy2xcA6ivFrr0Ctx4bXXWYcXI5paBk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589546571; h=Content-Type: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=gmc/XpWgSeGM+jz+wZTMIXDkI4JbzA56RY4ag+n3NG8=; b=ONngbWJkfZnUnsmw4V5BBU9mUqqCrEGJOVJmNLi/D5Dho3YMUpkUre6e1P1ZdqWjrYQntHDREc0lmtae72tlnuDmjfmDxMDNRj9z8cjhRYCLaS79FJ34GdQH91XDKI70V1dBK+bOKymFbgs2i92ZzfBZhVjRt0G7AWe0FxKGWzg= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass 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 1589546571461694.555802332171; Fri, 15 May 2020 05:42:51 -0700 (PDT) Received: from localhost ([::1]:54608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZZft-0004t3-RL for importer@patchew.org; Fri, 15 May 2020 08:42:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZe9-0002JC-Lk; Fri, 15 May 2020 08:41:01 -0400 Received: from mail-eopbgr150102.outbound.protection.outlook.com ([40.107.15.102]:11310 helo=EUR01-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZe8-0008VJ-NB; Fri, 15 May 2020 08:41:01 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5381.eurprd08.prod.outlook.com (2603:10a6:20b:105::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.26; Fri, 15 May 2020 12:40:55 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%4]) with mapi id 15.20.3000.016; Fri, 15 May 2020 12:40:55 +0000 Received: from kvm.sw.ru (185.215.60.184) by AM0PR03CA0039.eurprd03.prod.outlook.com (2603:10a6:208::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.20 via Frontend Transport; Fri, 15 May 2020 12:40:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XG5rfqtWFwh+zLMNNPhW2dyWQmAX7mvNKAbdXqWAC8n0GM+yxyC/yNDuMdTb6xYfAWNIc+9e0PWKMNualHmIN0tOgsEbO81RJE3IcZE4EcpUHpYHePwzmX7A47NdUrgm0oAB1pQzRDPfjigOlWovovjLZZU4W0rvWKAmgjN2tio3vUpDQEzjyl4P8vum3tyK0/TKznW0PMzPKvBbW5rTBgwGFyUepCDe4u3LE5Ni1d14wQg2ykOCrH2MfVCtzBX2LJ5GuhPhmYudqpmsATL4SlJDXtsny5N6iMPgRNlEDFgbe0Wkl34NWzZA/UHIlfNJiBV9R6pi1DPKzPv+EDE8PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gmc/XpWgSeGM+jz+wZTMIXDkI4JbzA56RY4ag+n3NG8=; b=DZoLJTWkHuMj68EZG5rnMlUPu4icSpIXxzYkZ2hb0AH8+F+9ueCKX+AA1Ul5F3rJkBjD0NiWKBXGZlHC/i/tOPmzCe0eDPaKWpvwK1+xvE1DnlwJ833SvWRxG8Jg7w5TsANeebVyQcTNOpfbiLOPgZu7v808RxSmZQ0Onmb2N0VVGAGD5ZLRp+5MgMUxWooDGsZSN1vY/7CwkDeDbQtl8O68RNEGYg41SsqH+qu0qYD+d/+iue1FM9nrsfdweP/D1IikasK/CwcmUTDkSjtSKgnY6VgNsY/TxU0Vx1UdqzFH1XRrmw87ihKuOYvTSmFLFQHYaQDPzJd3vlKbdG6+1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gmc/XpWgSeGM+jz+wZTMIXDkI4JbzA56RY4ag+n3NG8=; b=DJrGsh8S9l96Dm+HkFjqFbkoOGgMA7SxuSZF267x52DKqzBa4mh2dy9SsLmjW2ZNN3N8ALy2mNsLX/RGJtRPv19J3eKOsEjHFtL0dSlwDtFzOidpTDBacwZc+fNkKoDHF+w8tSSdnEOh7zIQRM5U0uhCVa9dIotoV3s2hmod/Ok= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v3 4/7] migration/block-dirty-bitmap: fix bitmaps pre-blockdev migration during mirror job Date: Fri, 15 May 2020 15:40:21 +0300 Message-Id: <20200515124024.3491-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200515124024.3491-1-vsementsov@virtuozzo.com> References: <20200515124024.3491-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR03CA0039.eurprd03.prod.outlook.com (2603:10a6:208::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.184] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07a8ec2d-ce50-4bff-dc42-08d7f8cd35fb X-MS-TrafficTypeDiagnostic: AM7PR08MB5381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1850; X-Forefront-PRVS: 04041A2886 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HWq/8mbXRXBnfV5qVB/GtWeL7sm+jlqcnwdo10rTCyqtdbIjrGAqoEy2yatUR2h+cZhnrfCaowzEp1VT2lth/WHjITLpWQrK+SLnMpEbrckEAhQwpsZRfMlYVC/Lja4tZDPhPiOYFLjp3tK2JR7xo1sUPwAFyNxd3dXe+XelguIqy5gVmsYOB26ozqbCFQIetKInvlggvVCQs7RSo06tiQeNBVFK3skMS0Xz7daccJ7VlEuUpD2Tcc4uKyXJd50XkOYECHfjKPrnqeTMau/xltv3l+uVaOnuVHBXO4+sZM65dhKthugEtWjvZu7E8iUQza5e/wGeTFTiKy6p50dHs87U7hv8OVFhI3Q7HWEKpsvWs4zWiz8y3B+8scic9esRySsPhvAhhHFc4Z6z6vDm35K/pukGExYEjgs7FbKm6i4vn+iByf/sImMVTVpgOhswO8b/9sJw0tyTbnMjnYk0SjRIWLz5eOg//jq+JRH5j4Qg8pGsxjXlHfv/4VnPgUrWDB/E3Gf/QN6CHrcR9PJcBzXKDrYhB4dkkLRmcqHUH061P9mZPO8kdAqDCxmy3Q4i X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(366004)(376002)(136003)(346002)(396003)(39840400004)(52116002)(6486002)(36756003)(8676002)(7416002)(8936002)(6916009)(478600001)(6666004)(86362001)(966005)(6512007)(4326008)(316002)(26005)(5660300002)(16526019)(186003)(6506007)(2616005)(2906002)(1076003)(956004)(66556008)(66946007)(66476007)(14143004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: is1iqEDcgcdldWI/OKNWrGtI6YJOEf/tVSvQYpPbwulnf8Ts+TKslUBES/LrSSltCzNLjx2HxlrblQqH+ojnKLCPH7PH1Hr+I4ZnvRyGR1wXW9JRbc1QpPoAKO3KCOfXAuZOcyIWo5H9y0hOollqTCyYFqyf1x0TgxOksEH0BHzRtBka2ZWsYZ+68gJZTMvfwZmkAOfniiX+OGGnGIv0fKjVIsXZjgVnvkaLKTxG6PgfPMKZcdncJ7N0KMwk4Pbk1HWfSwd5KpWa84Z42OOVgY7Cy8nVY1ILnThYJsAPMcGpvQV2x4VLgyD6+5tWKBJKYphucbCUfP3b7HMEdLR+2ZapdntjF2excQr4yAFW092r1pU42eiMIaxRLuZ2+apTo+7VcpBMko+R35MrDkg8s9QZr0V8BWKSieeT0D9bbevLUtoY3Ss5D9sOa/+Op8eQwwfDHwgHUlUCkKn+wIKedO65FGEGyg1Tf+CkoEgrMBw= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07a8ec2d-ce50-4bff-dc42-08d7f8cd35fb X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2020 12:40:55.5290 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: G8TQsqBNgbNz6UUQLFo1IquRzoX+vm2YZ++5xGFszKRbcsnVcbI5y3EnU6nYvpntpZUgZNTpjioMsyf9CBLihlZMudVQas8kvjT0rfNFKXM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5381 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; Received-SPF: pass client-ip=40.107.15.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-DB5-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/15 08:40:51 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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, fam@euphon.net, vsementsov@virtuozzo.com, stefanha@redhat.com, quintela@redhat.com, qemu-devel@nongnu.org, dgilbert@redhat.com, mreitz@redhat.com, pavel.dovgaluk@ispras.ru, den@openvz.org, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Important thing for bitmap migration is to select destination block node to obtain the migrated bitmap. Prepatch, on source we use bdrv_get_device_or_node_name() to identify the node, and on target we do bdrv_lookup_bs. bdrv_get_device_or_node_name() returns blk name only for direct children of blk. So, bitmaps of direct children of blks are migrated by blk name and others - by node name. Old libvirt is unprepared to bitmap migration by node-name, node-names are mostly auto-generated. So actually only migration by blk name works for it. Newer libvirt will use new interface (which will be added soon) to specify node-mapping for bitmaps migration explicitly. Still, let's improve the current behavior a bit. Now, consider classic libvirt migrations assisted by mirror block job: mirror block job inserts filter, so our source is not a direct child of blk, and bitmaps are migrated by node-names. And this just don't work with auto-generated node names Let's fix it by allowing use blk-name even if some implicit filters are inserted. Note2: we, of course, can't skip filters and use blk name to migrate bitmaps in filtered node by blk name for this blk if these filters have named bitmaps which should be migrated. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=3D1652424 Signed-off-by: Vladimir Sementsov-Ogievskiy --- migration/block-dirty-bitmap.c | 39 +++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index 7e93718086..5d3a7d2b07 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -319,14 +319,48 @@ static int init_dirty_bitmap_migration(void) { BlockDriverState *bs; DirtyBitmapMigBitmapState *dbms; + GHashTable *handled_by_blk =3D g_hash_table_new(NULL, NULL); + BlockBackend *blk; =20 dirty_bitmap_mig_state.bulk_completed =3D false; dirty_bitmap_mig_state.prev_bs =3D NULL; dirty_bitmap_mig_state.prev_bitmap =3D NULL; dirty_bitmap_mig_state.no_bitmaps =3D false; =20 + /* + * Use blockdevice name for direct (or filtered) children of named blo= ck + * backends. + */ + for (blk =3D blk_next(NULL); blk; blk =3D blk_next(blk)) { + const char *name =3D blk_name(blk); + + if (!name || strcmp(name, "") =3D=3D 0) { + continue; + } + + bs =3D blk_bs(blk); + + /* Skip filters without bitmaos */ + while (bs && bs->drv && bs->drv->is_filter && + !bdrv_has_named_bitmaps(bs)) + { + bs =3D bs->backing->bs ?: bs->file->bs; + } + + if (bs && bs->drv && !bs->drv->is_filter) { + if (add_bitmaps_to_list(bs, name)) { + goto fail; + } + g_hash_table_add(handled_by_blk, bs); + } + } + for (bs =3D bdrv_next_all_states(NULL); bs; bs =3D bdrv_next_all_state= s(bs)) { - if (add_bitmaps_to_list(bs, bdrv_get_device_or_node_name(bs))) { + if (g_hash_table_contains(handled_by_blk, bs)) { + continue; + } + + if (add_bitmaps_to_list(bs, bdrv_get_node_name(bs))) { goto fail; } } @@ -340,9 +374,12 @@ static int init_dirty_bitmap_migration(void) dirty_bitmap_mig_state.no_bitmaps =3D true; } =20 + g_hash_table_destroy(handled_by_blk); + return 0; =20 fail: + g_hash_table_destroy(handled_by_blk); dirty_bitmap_mig_cleanup(); =20 return -1; --=20 2.21.0 From nobody Fri Nov 14 18:06:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1589546712; cv=pass; d=zohomail.com; s=zohoarc; b=LbN9W0lqw5v3EMN1zzw43jjZGuOOycA5mLa79stmw5klSR2vTdkNXvKE8RWQ+dblhoQo9ZlVbNpInAEPZk4Pzd6re4xq+l8lgTyyZ0WSBYkRN7FCJxu6SdQlDkCQ0yyGzqpAx3Uksm4KVCzZ3Al//ATxhSKaUEVSxM9XmJO1gUI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589546712; h=Content-Type: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=pkZGicmZkEkWBSrAs6IV5fxCC8gFscTRY0mZLskPr+A=; b=UMUDq4Vc3GeqjBSiG+4VwCzZ80BglhJXX8JZtzipj6JsiaSj5P0igK3GQ5d2HoeRmLIYSDBtKQHmdjiYai3ksz4E/m7pO9OcQ69zqV/KSPlns5iMwh1kSygsM8NuoX4uZ1qfeU7NF947rK1ZDRkPcvmuKYMVNZboxmHf9S6NFG4= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass 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 1589546712904618.7048810983317; Fri, 15 May 2020 05:45:12 -0700 (PDT) Received: from localhost ([::1]:35004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZZiB-00006N-GH for importer@patchew.org; Fri, 15 May 2020 08:45:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZeB-0002LN-P3; Fri, 15 May 2020 08:41:03 -0400 Received: from mail-eopbgr150102.outbound.protection.outlook.com ([40.107.15.102]:11310 helo=EUR01-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZeA-0008VJ-5h; Fri, 15 May 2020 08:41:03 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5381.eurprd08.prod.outlook.com (2603:10a6:20b:105::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.26; Fri, 15 May 2020 12:40:56 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%4]) with mapi id 15.20.3000.016; Fri, 15 May 2020 12:40:56 +0000 Received: from kvm.sw.ru (185.215.60.184) by AM0PR03CA0039.eurprd03.prod.outlook.com (2603:10a6:208::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.20 via Frontend Transport; Fri, 15 May 2020 12:40:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HiAK3fT/t66DKsWRpzpMZJDAkSwRTsRj20g9tvc/Cv18Q8V474+UUOPbTHHxZaQBVsxXM4x3z1a/c8LpDHRP9/KX6oDhC1MNOsHh+jJyfCfr4szmMpP3ktnAOfxQQgw9/fVQsPr7T5QN+eYC/gNua/DslGPMDnCpIqbxDhM0inwwrq2JcAn52uRGaPfw4LLi0zKL4e1tQ2guLSFTmwDMhJtR2UqBojzaSOaMVOaNIe5uSqfaPJNHGA1eMgzXPyzbqAJ58/4rgFDcBCqgJAbDXT6la8CD7ZS9LfxtnClheeXbXZf9Co8C38Ds/Pxb5av9+KY0FZkOEB/Cq8uT5UHZgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pkZGicmZkEkWBSrAs6IV5fxCC8gFscTRY0mZLskPr+A=; b=hfhwqP9g9gcwISBGU7Ouik1ZlOMMwPD8lC+61Fteswq17efbwcNX6MDTZolaLpBmA2ICgPZaKljQUyOM3DHF1EWt9JbwJNc4y81+yPBRt/5ku7eJnVfALDTDMgniYNOQ14j+3TtKJ752q6rlek9jI+3Ghtj6rhAAUYkqMkLmF2LLyd/amg2Z7l3eT4GjnKAHcfwxtBLF/jNGLDZivHpJcczvfjZaEvMrnEfSrjxW0o7d22ZkRCIzH5pl7agVCiQ8Vu4WcS1EtqPV9sZ0J2v5LkNJuxPWfvyUJSp1e0Ql2gRIUio29vF4ahFdGjRkaNOzZ+QMJu5oCemu1YGayV/vqA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pkZGicmZkEkWBSrAs6IV5fxCC8gFscTRY0mZLskPr+A=; b=PT2C4ZVT1zTGYnvZ6/Ps4rJ0pOzuan3st44sCe0R05E0/Own+IDqEaoWOHM5EA9ki2ttqWfayCGMq/r5txQagzjeUmfZJDr9GnxgWKS1WcWhzF70yLtebPRu2SfHjQinPtV44JmQzdGX+4ki6fEuK6qi3+i6Q5kz1CUVzo3MtUo= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v3 5/7] iotests: 194: test also migration of dirty bitmap Date: Fri, 15 May 2020 15:40:22 +0300 Message-Id: <20200515124024.3491-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200515124024.3491-1-vsementsov@virtuozzo.com> References: <20200515124024.3491-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR03CA0039.eurprd03.prod.outlook.com (2603:10a6:208::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.184] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6e152baf-9163-411e-bd06-08d7f8cd36af X-MS-TrafficTypeDiagnostic: AM7PR08MB5381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1227; X-Forefront-PRVS: 04041A2886 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UsbvVEDHbFuYRlOlS0cE71lDq3y8CvnPKDWFFqikQsE7zC0y/iY9/BrvAQfzDnMzp7z+4F9e86UvB5rnZcp52JAlfe04Ct0Hmbgaeed6JG6QrYsk911rKSz4EIr5NPzHrZkI0BCO8tOw6mISOcB9zrk80QGrDl9oIfrS69pD7kbWS6mrZvNXwUzv4W3+hdrK9o06iR76FaASRIgpJ04tVVHgqsNHGBmc9IErbIXs8CLsFGCiPoM4YdrcwZB//dPE/v6v7ClGHmEdpFiMZWIhVPSuq6GdkfZVAF+/O8nIwxNlmXrQY+5N/rtrqahko8nPVJMtnlwYjUpWyE/xd66Xdgij1YsIMbm/CzN1R70DZ9OVU0b1OjdxxHL+HEbYbfjjCJjA/YNTBMK8HErxSRy89aClXAQCjLzH6KtpMf9T0lxHpLSCSRonoCuK3TqjKiysPyIwbYtLHWZziycN9JCX85IO/UvYWZyBcrnRhy9szmn7AMV81/Bj3YiP8G9xH555 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(366004)(376002)(136003)(346002)(396003)(39840400004)(52116002)(6486002)(36756003)(8676002)(7416002)(8936002)(6916009)(478600001)(6666004)(86362001)(6512007)(4326008)(316002)(26005)(5660300002)(16526019)(186003)(6506007)(2616005)(2906002)(1076003)(956004)(66556008)(66946007)(66476007)(14143004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: +tRW/FVFtnI8N5zOKHc8p0rc0pyuy3jLyqjyHieNhgcMLLp62+70BIS4hZyzoqek9UPr9mkdNO/tSP/j8JsqnJOJgAyOi+dQIsZBSYm/iNajiPk2FGlyQ+xSpYiGRfzWYDclLblOUHbgNj/SqdjPC7cpPBOSJHf0AteZdPUTuf3GsD3vARScMAd9CEBZJUnrPcR8f7v8h1olmYawwzBylqPq9FUeBSo2jqJlwdBZhwy8tf4Y9x2BN80RU3QFOXihuXOlviliuY8KduISMJ/d/VnFFrmEL6WZOvfH4BULHFtGM0ofYLQXA4x5JlbCMgRzKZZ2SZd4KMyLF6f50cYBcduPeznl6MAjtehpfSwe6ccdInG2b7EOOioXYACaGtWD8E35fVDoLDpKCOD4JHI0HFvx8766U5PpEx6C9ZRwySA2ytmsf6fRKWhKeIvbFWWlXu3q44FB/TbKLBDeHey3WwmgvQGicPpy7uX5hJDdTSo= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e152baf-9163-411e-bd06-08d7f8cd36af X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2020 12:40:56.7238 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HpyEOUTaIVwd81FKYUZqDWuxLiaV2cecbr8hAarDkHYjj4kwDOl35FA03TlFmBmUS7jMw965xdO4kjVVSj9W86sYrks9ghV/HN0UGaTfFTo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5381 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; Received-SPF: pass client-ip=40.107.15.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-DB5-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/15 08:40:51 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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, fam@euphon.net, vsementsov@virtuozzo.com, stefanha@redhat.com, quintela@redhat.com, qemu-devel@nongnu.org, dgilbert@redhat.com, mreitz@redhat.com, pavel.dovgaluk@ispras.ru, den@openvz.org, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Test that dirty bitmap migration works when we deal with mirror. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- tests/qemu-iotests/194 | 14 ++++++++++---- tests/qemu-iotests/194.out | 6 ++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194 index 8b1f720af4..3fad7c6c1a 100755 --- a/tests/qemu-iotests/194 +++ b/tests/qemu-iotests/194 @@ -42,6 +42,8 @@ with iotests.FilePath('source.img') as source_img_path, \ .add_incoming('unix:{0}'.format(migration_sock_path)) .launch()) =20 + source_vm.qmp_log('block-dirty-bitmap-add', node=3D'drive0', name=3D'b= itmap0') + iotests.log('Launching NBD server on destination...') iotests.log(dest_vm.qmp('nbd-server-start', addr=3D{'type': 'unix', 'd= ata': {'path': nbd_sock_path}})) iotests.log(dest_vm.qmp('nbd-server-add', device=3D'drive0', writable= =3DTrue)) @@ -61,12 +63,14 @@ with iotests.FilePath('source.img') as source_img_path,= \ filters=3D[iotests.filter_qmp_event]) =20 iotests.log('Starting migration...') - source_vm.qmp('migrate-set-capabilities', - capabilities=3D[{'capability': 'events', 'state': True}]) - dest_vm.qmp('migrate-set-capabilities', - capabilities=3D[{'capability': 'events', 'state': True}]) + capabilities =3D [{'capability': 'events', 'state': True}, + {'capability': 'dirty-bitmaps', 'state': True}] + source_vm.qmp('migrate-set-capabilities', capabilities=3Dcapabilities) + dest_vm.qmp('migrate-set-capabilities', capabilities=3Dcapabilities) iotests.log(source_vm.qmp('migrate', uri=3D'unix:{0}'.format(migration= _sock_path))) =20 + source_vm.qmp_log('migrate-start-postcopy') + while True: event1 =3D source_vm.event_wait('MIGRATION') iotests.log(event1, filters=3D[iotests.filter_qmp_event]) @@ -82,3 +86,5 @@ with iotests.FilePath('source.img') as source_img_path, \ iotests.log('Stopping the NBD server on destination...') iotests.log(dest_vm.qmp('nbd-server-stop')) break + + iotests.log(source_vm.qmp('query-block')['return'][0]['dirty-bitmaps']) diff --git a/tests/qemu-iotests/194.out b/tests/qemu-iotests/194.out index 71857853fb..dd60dcc14f 100644 --- a/tests/qemu-iotests/194.out +++ b/tests/qemu-iotests/194.out @@ -1,4 +1,6 @@ Launching VMs... +{"execute": "block-dirty-bitmap-add", "arguments": {"name": "bitmap0", "no= de": "drive0"}} +{"return": {}} Launching NBD server on destination... {"return": {}} {"return": {}} @@ -8,11 +10,15 @@ Waiting for `drive-mirror` to complete... {"data": {"device": "mirror-job0", "len": 1073741824, "offset": 1073741824= , "speed": 0, "type": "mirror"}, "event": "BLOCK_JOB_READY", "timestamp": {= "microseconds": "USECS", "seconds": "SECS"}} Starting migration... {"return": {}} +{"execute": "migrate-start-postcopy", "arguments": {}} +{"return": {}} {"data": {"status": "setup"}, "event": "MIGRATION", "timestamp": {"microse= conds": "USECS", "seconds": "SECS"}} {"data": {"status": "active"}, "event": "MIGRATION", "timestamp": {"micros= econds": "USECS", "seconds": "SECS"}} +{"data": {"status": "postcopy-active"}, "event": "MIGRATION", "timestamp":= {"microseconds": "USECS", "seconds": "SECS"}} {"data": {"status": "completed"}, "event": "MIGRATION", "timestamp": {"mic= roseconds": "USECS", "seconds": "SECS"}} Gracefully ending the `drive-mirror` job on source... {"return": {}} {"data": {"device": "mirror-job0", "len": 1073741824, "offset": 1073741824= , "speed": 0, "type": "mirror"}, "event": "BLOCK_JOB_COMPLETED", "timestamp= ": {"microseconds": "USECS", "seconds": "SECS"}} Stopping the NBD server on destination... {"return": {}} +[{"busy": false, "count": 0, "granularity": 65536, "name": "bitmap0", "per= sistent": false, "recording": true, "status": "active"}] --=20 2.21.0 From nobody Fri Nov 14 18:06:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1589546720; cv=pass; d=zohomail.com; s=zohoarc; b=Z2aaByHsp/gyXB7L9o0IOKBAEGVPY6WOSvmaNXnFbVdu7if6h3g/O3X/GqmEB1I1/4+fLY6wAP+NRRJPdrsR0CWtuR7PrhHyNuqTqKX/JgsIM8SHEeM4cgwdrcBFasr7ZQMN2c9ZOYxFVFseTlQyE7oef0NtWUoOSbtX+k2+oNc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589546720; h=Content-Type: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=KoR51FPmK9iPU+aqvkBnJNpHY102FTaddia2Fp3H8sg=; b=UCU5JUsbMkDRGj8hCfiWPcAKdEbPNM+F2A17ME1uiJc0JTLRAriIXKAzDYEFURMfi4WfzTgmV0YyyoeCTyG8Lqr9cL1PH24k7F9y+0WAmAF3Xl/lTkqXera2BbHVbSfSlyg/7+O9pC9AcktPexVHLBtYRVlRmvz0Xflz2thenHE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass 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 1589546720828360.4193856008884; Fri, 15 May 2020 05:45:20 -0700 (PDT) Received: from localhost ([::1]:35694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZZiJ-0000Vb-FN for importer@patchew.org; Fri, 15 May 2020 08:45:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZeD-0002PX-DA; Fri, 15 May 2020 08:41:05 -0400 Received: from mail-eopbgr150102.outbound.protection.outlook.com ([40.107.15.102]:11310 helo=EUR01-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZeC-0008VJ-AW; Fri, 15 May 2020 08:41:05 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5381.eurprd08.prod.outlook.com (2603:10a6:20b:105::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.26; Fri, 15 May 2020 12:40:58 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%4]) with mapi id 15.20.3000.016; Fri, 15 May 2020 12:40:58 +0000 Received: from kvm.sw.ru (185.215.60.184) by AM0PR03CA0039.eurprd03.prod.outlook.com (2603:10a6:208::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.20 via Frontend Transport; Fri, 15 May 2020 12:40:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=clAKot/fn4znR6Gk7K7XqgqT2WxEGMfnWN+5if1YIFUXTTMR008DsPmRRTpGHEmLidqyncU8FWqq5BZ0uHtOJMAaGsZLObM29zI7OGx9VOPW2lIOhQfTEjLA36GIYNgKkXajVBw25Yk0nzTPZPqxVvnkoqWvHj9gOXqPKl/lj4qQ7MVy7SBkN5Ff/pW3mlP84SA9Zf3Fy17RRG+YgqyL5gK5yy13rwML/vD+vxv6ZHRKHTS2WbNnDGfVrt7aXcrlqMMHEE8yX9uO1LStgoztttAMNXGu9N6hBBNbvZielV8xAGJx3YtM1v8to2NhuF6QSLuUlnjMJ86jliFOJkXNsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KoR51FPmK9iPU+aqvkBnJNpHY102FTaddia2Fp3H8sg=; b=dVCh6MlTqAxYUz9VX9YtgKuhU2eKj6yVPOIlu4do/Dtn9LvR1PBjNjvRXDYHUB82lDXm/cG0If0Ke1qlWJlM2YiNgsbEwQ2xk+B5P6Y1KIx0iQr+/Yc0//OQmidWfQ5ifLE6KjwXD7mhO8rYU1MYJ9f78Efyl/i4KVSquyIKi+Yw/x9Keqnt6P2PlijCCiZLIK+clqIwd6w2lZgqm+aN8V7EHXwrehzPTL9eiuX5V/MjRm1myjo5QO/SqYPcSvlqi6HvU6Xq9MnZ3+6uGLQ8MFSK2tpilKBsbePuJwjtEF3Nj6ITYAweRWnE/h7jB7bUO3zr7ePFjxjDT60/ymOgZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KoR51FPmK9iPU+aqvkBnJNpHY102FTaddia2Fp3H8sg=; b=ALjeddDgW3WqoEcI9/F3BWmz56seqWlBq0bHnmCqL2y9+TSW/R5UuOeVOxI0EgwNGSJ2DhNUnvLVLdC0DqHRnI9lgg/LoiwyB71n/imUVbZapTy0Br0ueOEEP9b8hXR68EZnoBXxcByl8VWEuJkJx0mvQDP5DII51NUIljFUmAo= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v3 6/7] migration/block-dirty-bitmap: add_bitmaps_to_list: check disk name once Date: Fri, 15 May 2020 15:40:23 +0300 Message-Id: <20200515124024.3491-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200515124024.3491-1-vsementsov@virtuozzo.com> References: <20200515124024.3491-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR03CA0039.eurprd03.prod.outlook.com (2603:10a6:208::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.184] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f47c8cc-88dd-42e7-e23c-08d7f8cd376c X-MS-TrafficTypeDiagnostic: AM7PR08MB5381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8; X-Forefront-PRVS: 04041A2886 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +YiIjw5L03lr/ah5BESd1h09Xai7Nnmrw8u+7HMRCaLZrXxSPxDN8aX084vWuQixgBbexyaIXP1YdEoUVwP1+YDpNFzyFh+CSTIEi1mndf2hjWRoqgCT94ERA0/xgTC9FZKAhWMGn3fow8Lss8pSGdBdJ46Diuwi4uXlrNhp3NWKpaBIv4ZcYDa8ILArWR/8K1X+iSO5fwN+iTBUXUbvdzSGIwdAqP7WWW8C0t5DOxeZtQDrcUv9DOfNtknvC3s2nPz84b8HacW/v7Hx7Yg28gbUcN/CqMzCZkEC+CTKM5lonFQDV9D6HxZO7GIAs1RP15A7WpN+/Tx5dbXcpsW5sgwoFAsWHWQpJwTJE9ZQaFbfp6/lCZcJpr2ciX8VksyigyUyNjojKcOtOeZ3QovMeX4YUsNHbQSpiDF7mSA2UcnMPDtKTjigKCLm6Nu3qRfig6bP8GF+MA3WyFBHIezw+ty1O0zpuKc4eDjs0dRiZXY= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(366004)(376002)(136003)(346002)(396003)(39840400004)(52116002)(6486002)(36756003)(8676002)(7416002)(8936002)(6916009)(478600001)(6666004)(86362001)(6512007)(4326008)(316002)(107886003)(26005)(5660300002)(16526019)(186003)(6506007)(2616005)(2906002)(1076003)(956004)(66556008)(66946007)(66476007)(14143004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: jUMBTK63BFYIXV65bYMkLNo5e0eG08k7xfBZqIKUxdXurQKK5xwctadptwwF53RvUV6gNSm98SDM7+DlP3VMy4R36JftHxxJj3QGq+PsX2RJce1R8ZmUdFZywleItUaN7pmvz/gKuqqqWNTlGwINtzjtL3HNgh6dUBW7OcC6w9YihFBxHiZfULOu9A07gxuHs2r5hslbUpQnzwrLcIXbExNXz2EpRaEk2vhxCwh9te/ITNsvKbK1hANLrt60ll4BOyOWQlw2sI2kYADDJh/o0tZ1ZeL2uCohzqVTqlXgn7gSp6f7+PDzZeAHdae/FKFgPcG3Tjy34ca7D1mvms2ao8TXZHOHjTjm5uIUtKZIs2WAXrIxRVzC83YBQ4DrxGYkiQSmTgFzBSfNYXrc9VjClNu3/u6lAUymvrLp0qbBIgxG+bxLUp5THnepPXFEvqX+KT+kZswR2WqnREpYFnw81wxziRSQSG5twzSYVrUlOME= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f47c8cc-88dd-42e7-e23c-08d7f8cd376c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2020 12:40:57.9286 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xD3K89714+YIrSJ/ROwJWzEUFkP4J0fyWDOFrYb6Go4mK5mBX6lJ/RZ6+c585aW7X22DJTL4b046nK8m6kpJpedJp9EJJEVb/LA2mZZ1d+I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5381 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; Received-SPF: pass client-ip=40.107.15.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-DB5-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/15 08:40:51 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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, fam@euphon.net, vsementsov@virtuozzo.com, stefanha@redhat.com, quintela@redhat.com, qemu-devel@nongnu.org, dgilbert@redhat.com, mreitz@redhat.com, Andrey Shinkevich , pavel.dovgaluk@ispras.ru, den@openvz.org, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Andrey Shinkevich Reviewed-by: Eric Blake --- migration/block-dirty-bitmap.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index 5d3a7d2b07..e0e081ce60 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -274,17 +274,22 @@ static int add_bitmaps_to_list(BlockDriverState *bs, = const char *bs_name) DirtyBitmapMigBitmapState *dbms; Error *local_err =3D NULL; =20 + bitmap =3D bdrv_dirty_bitmap_first(bs); + if (!bitmap) { + return 0; + } + + if (!bs_name || strcmp(bs_name, "") =3D=3D 0) { + error_report("Found bitmap '%s' in unnamed node %p. It can't " + "be migrated", bdrv_dirty_bitmap_name(bitmap), bs); + return -1; + } + FOR_EACH_DIRTY_BITMAP(bs, bitmap) { if (!bdrv_dirty_bitmap_name(bitmap)) { continue; } =20 - if (!bs_name || strcmp(bs_name, "") =3D=3D 0) { - error_report("Found bitmap '%s' in unnamed node %p. It can't " - "be migrated", bdrv_dirty_bitmap_name(bitmap), bs= ); - return -1; - } - if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, &local_er= r)) { error_report_err(local_err); return -1; --=20 2.21.0 From nobody Fri Nov 14 18:06:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1589546886; cv=pass; d=zohomail.com; s=zohoarc; b=jODzzhRnIZXOkKF6EAbqyR3bHfeJb71JblzrP98hTINce1dbx7nZgs1t6BoelqJbucaLe7gEOSkRek8W1ZPcNjUMCdDBmf3Au+kMXPNfCBdlL8vITiA6R3Ek/XKKm24qqq0J2bCuSz4fTfiYmSPrD/vXtJLlLF1g3aRpG5riijY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589546886; h=Content-Type: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=ZSB2hKNLczbYc9ZqKMwDegweqQ1vr9FoUCy1i1/yrhY=; b=VrM29t2/Lv5H4VdHAN2HwrD8slDutIDobBGpIYO2JYktrOY3bk56y8GMkGVp7m7NEUpM+YXEmSdTwF2cE/wId6n51PB3CmtNNK+9L52mzaKEK8tbv/gYnpJ/CvJwdtN9gldmW0Yhrlijlp9DYbPEFrZj7w9LwZY20wLgFrnKTek= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass 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 158954688603262.844115451701214; Fri, 15 May 2020 05:48:06 -0700 (PDT) Received: from localhost ([::1]:44666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZZky-0005Cb-GY for importer@patchew.org; Fri, 15 May 2020 08:48:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZeE-0002UN-Sy; Fri, 15 May 2020 08:41:06 -0400 Received: from mail-eopbgr150102.outbound.protection.outlook.com ([40.107.15.102]:11310 helo=EUR01-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZeD-0008VJ-VS; Fri, 15 May 2020 08:41:06 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5381.eurprd08.prod.outlook.com (2603:10a6:20b:105::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.26; Fri, 15 May 2020 12:40:59 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%4]) with mapi id 15.20.3000.016; Fri, 15 May 2020 12:40:59 +0000 Received: from kvm.sw.ru (185.215.60.184) by AM0PR03CA0039.eurprd03.prod.outlook.com (2603:10a6:208::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.20 via Frontend Transport; Fri, 15 May 2020 12:40:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Uo+Y7/dLEtZAbHZoFOoi72qFFzJJ/lZLqOxTOjiZ+3uMVV21n2vH6mN7mGqUWcICz4S/lrSHNgGAViWq9cg2xKythx5Poxi+clQ07oBas17YYAT06BtU2UmlMWIK7BURgsz5G7OjyTPXciQvbC2cvewy+9cKMux9dU4OYHB3NtXLE+IOc/z5OGHOMRSjhxNBNChanPhkLL4V0/gF8D+Byv4ikZMKYOZU/4vQ5OgTZyyrvugGROQcgx3WOSFCBr+AEiKfW8/2ttJgy/vmiorRPRnyxFBb90O12uidpcR4ncOyazRKp69mGBP/wp6VR9H9B+NZJtj6lSMizoQ+ycGa3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZSB2hKNLczbYc9ZqKMwDegweqQ1vr9FoUCy1i1/yrhY=; b=Y8MTdplWyJ9E58i+nqTR4yLhHE57Rd6c3jsnYevnBm3mgzAAInjdwx393F8vpbF/fUYVfPQNdaw5GpOCstTCIYcAKuf4FxxN9FdlLPSuh3arzrRGvYtfsnCGu1KpoLc8RCkvbXRBalQwq3XZ+BzkkC6+ikXfEhcU3Jazg4LvjuNesNFG+O1EohPfTeQsuv3IZziPCgQSlYKlhDfSJqA+5/eDT1HT6+ILVXXz99IDyDRZah6rTx60YHrZlJZOfYSn4Yu0wcMfYRBeDEoBu5BbGTb+5C38tpXz/S1Im+yK1/a19zI7L8dG+0z38KU+Mt/E0YAvN/oos1qAMZLgh97skA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZSB2hKNLczbYc9ZqKMwDegweqQ1vr9FoUCy1i1/yrhY=; b=nMSCjOk5Tg+RI2Mf9cH+6u0Jn5+1xDl1t1hbbQNB8aWTnU09e8pDyVQ8RxEqwwlsKFZsppmilKR7Xfpo8tCjyrJURX9cJlPoX9SYo7f7okfNw0lM1mhbw6Z0nOXpWF4CkiOK9oJKcL0X76l37t65tNBuqFxiiGJoYkk/NH38W6U= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v3 7/7] migration/block-dirty-bitmap: forbid migration by generated node-name Date: Fri, 15 May 2020 15:40:24 +0300 Message-Id: <20200515124024.3491-8-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200515124024.3491-1-vsementsov@virtuozzo.com> References: <20200515124024.3491-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR03CA0039.eurprd03.prod.outlook.com (2603:10a6:208::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.184] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 40384dc3-e3ee-432d-8281-08d7f8cd3828 X-MS-TrafficTypeDiagnostic: AM7PR08MB5381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:15; X-Forefront-PRVS: 04041A2886 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AUAgAEGaz9voBAd7c+WiVBi59q/g9HKmxhZaFka8AxrGtnodN4USYXXKKbCutG/z8tE3d+xGRchbehr4GX1tcsA1AJpVFYpeb6CXMd+EDeBUxOXi4WWw6m6MmRABriYpB3GtHvjVoxsjC32Mv1vLdyloPc7twbZu2FRAM1jb71ubrHc9+E6wsYJJZF5aueJlG1/6TQCcnLrc+byXn9sQ+H1+y3SpUCpWAJV9ZDhf8wh2RLWcySspATquvORVAZM+HPpPa76iVtVTDdKb6/c1Pk514JvJEmBxwndUrXGAp7BSUIOorMRlIZ+dLOR/LLUbGvo8Pe72l1T2cIB8CsORborx96bWktfz9I+6ZXvebP14iyWs7vbpfV7CuUCfPfapSbziwi3TNnCcCWy4tQkJmtiJ2SoH794vMWOeKRgyKZ1YU266xluU5PC9LCmXj9nj+1TcV1Qu3ak/+watjhuwDWCx5+J5Kl9J3FlRQCi00W0= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(366004)(376002)(136003)(346002)(396003)(39840400004)(52116002)(6486002)(36756003)(8676002)(7416002)(8936002)(6916009)(478600001)(6666004)(86362001)(6512007)(4326008)(316002)(107886003)(26005)(5660300002)(16526019)(186003)(6506007)(4744005)(2616005)(2906002)(1076003)(956004)(66556008)(66946007)(66476007)(14143004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: j4dCfSXhzIXKSGG5CbbQ8KFUbnCF9q3aseQdDhkHiRx7qaAbzwCttfrqN79gN3yaWOSdubUxad2MP8MRSt6rFOGUvK09dknXFkNz8KP5uOghHvBYrkCuV4+E1VwEBZtCHZI40D30v95M+sUywiU0+qNLKi2/ZShyuGpRDNDojGmi3novMjLLGVotR8FOFiYPHeC0xybR4ZdPOiCRd22ZFWENuS6aNfXKmC5A9Sdg2g8HjzHRz+bTN43uIBU4JT4LqAxoSgSQ6Gonwhl3xhdCsDo8Lc7jeG0ihMd3Ug4vCdhYIUENvhjHnel4ngo11JH9TSNsSzi6NIpuWaLOgIKpkHxjxHLdzICYslJwlnd4ur4i9j7/jfRk5kYmr+oARHRErFSM5qPTolVFnlf7WHcYptBJn4BNRgPCGRO02AV8h5CpjnazNJisgJOqx4k897yKgbGd7seap+U4D4z5eDdRJdVO2Qz+KtsdfI+++SC0LFc= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 40384dc3-e3ee-432d-8281-08d7f8cd3828 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2020 12:40:59.1930 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ghieIhwabVWeVtyJKO0IrIVC7Z7a7qiTAWL2k3e9S1j42ypkMOgfMr1d1+d7CBPCB6S4KprbQGE0Tdbg0FKaasHMT8X8cNsKA4rdXvcILBs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5381 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; Received-SPF: pass client-ip=40.107.15.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-DB5-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/15 08:40:51 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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, fam@euphon.net, vsementsov@virtuozzo.com, stefanha@redhat.com, quintela@redhat.com, qemu-devel@nongnu.org, dgilbert@redhat.com, mreitz@redhat.com, Andrey Shinkevich , pavel.dovgaluk@ispras.ru, den@openvz.org, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" It actually never worked with libvirt, as auto-generated names are different on source and destination. It's unsafe and useless to migrate by auto-generated node-names, so let's forbid it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Andrey Shinkevich Reviewed-by: Eric Blake --- migration/block-dirty-bitmap.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index e0e081ce60..f5744c35e6 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -285,6 +285,13 @@ static int add_bitmaps_to_list(BlockDriverState *bs, c= onst char *bs_name) return -1; } =20 + if (bs_name[0] =3D=3D '#') { + error_report("Found bitmap '%s' in a node with auto-generated " + "name: %s. It can't be migrated", + bdrv_dirty_bitmap_name(bitmap), bs_name); + return -1; + } + FOR_EACH_DIRTY_BITMAP(bs, bitmap) { if (!bdrv_dirty_bitmap_name(bitmap)) { continue; --=20 2.21.0