From nobody Mon Feb 9 00:55:24 2026 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=1590098906; cv=pass; d=zohomail.com; s=zohoarc; b=Xp/cnE41465fGrbdx9Coi2Srbw0rfBJ7s/zGzcvR3nkHZZs4WoGiZ4HfTILpoNSlKBDWYvwoSptjZxG4LQvIKTbM5LvG2QoNp2UA+Ap+sqF/hm5iH234YQAUsS6HFAhINu7IsZP/g2WiGrTk2KOUdTTAsMWX7z5wpATQCJoGEu0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590098906; 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=+Gdvh6TdoVGPfRVPYfBGlJxZ/AR9HXnns9XBE2Igtcw=; b=bKcLHG3U+ZDtJJ2J7DkXkxPzXbYNGZZom1hTTjkk3clZY9zLPfXo+ePA3KGU1nQfFwlHFoyQj1sbeUUfRBTsHAvxGDfn0/SWwEApI4v8TzKd6TS93vpzbP9xMcJOO3h3C8+RUP2dgwkDMaZ9jUv4rSMeAHt2PGmMcKRoFC1EsgY= 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 1590098905643581.3391295307206; Thu, 21 May 2020 15:08:25 -0700 (PDT) Received: from localhost ([::1]:35346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbtMW-0005mm-7E for importer@patchew.org; Thu, 21 May 2020 18:08:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbtLQ-00045L-R2; Thu, 21 May 2020 18:07:16 -0400 Received: from mail-eopbgr70104.outbound.protection.outlook.com ([40.107.7.104]:17734 helo=EUR04-HE1-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 1jbtLP-0007vC-Vd; Thu, 21 May 2020 18:07:16 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5512.eurprd08.prod.outlook.com (2603:10a6:20b:de::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.24; Thu, 21 May 2020 22:07:06 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312%3]) with mapi id 15.20.3021.020; Thu, 21 May 2020 22:07:06 +0000 Received: from localhost.localdomain (185.215.60.167) by AM3PR07CA0137.eurprd07.prod.outlook.com (2603:10a6:207:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.12 via Frontend Transport; Thu, 21 May 2020 22:07:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g8tGf0qqNm4z3Yg+iGZQJvlcXaLUAr6tmqJoDdih+gPY1tA7e/3Rub6IroTkBqh9GOMmuGWsgNMBHwwqM2q2m7Ov9YAfVT7e5GLSB9J10Fbt3VqJM+ZJaw61uuxdsHm0UyY9Ramm2FJpdw7DiQN7nLMV4EHJ2/jsfjQXDLYsQVGJ/Vi2vV70SaSeUAR8LcHAa/82EfUyMvMNUbBnYT1cWP/1MIxh0rCnTQ2l/LzAXMajQupvUCqEBEn3BIp4/NNMT1z1xZ95jtEPfu8Oo5UvRdx2AuR6x9do0vAT8fxuV8B2yQpkvWwHoofwofLbKXF09OlCnq/b1mf5kNTM0e8azA== 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=+Gdvh6TdoVGPfRVPYfBGlJxZ/AR9HXnns9XBE2Igtcw=; b=hnJ/2LmvLpmSOCcAxVmOE023QwJc+yBi03IFotL52fhHbLRqj37MvA/YA0aSU+2ifUEFJ5h3XWcd3U+tJFRZLXDDOXVEXCxty2poBmc4nG5CbwEVuCbofuBHaxPTJrUsvk6aXGv7qNZQuoCo4zzsCIgB06Q+Gps8xl5+HJ0ywHKar1/d0ZJmOqYFcQ0Z1hUEaykIz/yMvMhRmtT6Mh8nMkwarpUIaZ4PqkQC4dMQVn9nDzOk83cAMUmycjls+Rtq5CMHW5nkjWm4ksAg3nYLb/bJc8PICWqIZipG2AkCtbBvNY53eY/d5siwTtcDBSMg54eZk6hARCndxvAP9AzFoQ== 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=+Gdvh6TdoVGPfRVPYfBGlJxZ/AR9HXnns9XBE2Igtcw=; b=XzyCpb/y0H5gf+I1bdpj3Kd3HyibgwMFXJd4GH69FpqWGjIoSu06Cezaw03G17K7dI8TYlM1HakzRsbcEVSz2uiWet1zQtG7BF/+49lGtwCEliI093nb9AHgUOuLGQei75jT5t1oeGJFNsWlPish7ZsY8WoBz1QlprUCdaY72vg= 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 v4 5/6] migration/block-dirty-bitmap: add_bitmaps_to_list: check disk name once Date: Fri, 22 May 2020 01:06:47 +0300 Message-Id: <20200521220648.3255-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200521220648.3255-1-vsementsov@virtuozzo.com> References: <20200521220648.3255-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM3PR07CA0137.eurprd07.prod.outlook.com (2603:10a6:207:8::23) 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.167] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a9ca918-4932-4d93-68bb-08d7fdd34c7c X-MS-TrafficTypeDiagnostic: AM7PR08MB5512: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8; X-Forefront-PRVS: 041032FF37 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T/O0tYKSR9ZPP01m18SFqPswVaOvAiQj6/yMAHnp/U3FXRXkbXqsA4Q7Pw9OjZnX/oUhooxvTLl+htFsPxuQRWa5h6LMzOVuqHZbOXkh9//4M/ibG4Gp5Cugx3CZIzZKKHDVT38eCIXSojmwdiVeVjEb2VOWgO8WiB8fKbQR6WLn0YjjFlmMSzxJ+OyP/vIO3POUhfLFvkn+q64wq2KF2b9tOf2W/jflJRvsR4HCOzntuV8WNOgevhn38Jz3HTaQq7WCg/+PIPzrHX8ptQr7+8gx2yJw1NFV4ELK6ulbY0kCtuU83petRtMEci41Rx02TAHkhtGPPo5qaMazOBpJvyeu5L3HU+jWtqpBOL0VGbFIojeg4+d3PVRH36ZYBnlm5HXxpnor+axjlVnKjwGipw== 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)(346002)(366004)(396003)(136003)(376002)(39840400004)(8676002)(6512007)(186003)(26005)(6666004)(2906002)(7416002)(16526019)(316002)(6916009)(8936002)(6486002)(36756003)(6506007)(1076003)(107886003)(478600001)(4326008)(66556008)(66476007)(86362001)(5660300002)(66946007)(52116002)(2616005)(69590400007)(956004)(14143004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: nD7I+RAWJPCMQV4RIcspw97bV0rGlOaUbB9QiIrIvkKZMKi9vHYlTfWT2wKnxBuoKgc8enWo6O8MPOXtr6Ty3t16NLV4GApCASJQ3pKZ9aW9CKsmShqB5xjIf1rE7q7MStQE0fONs3IhH7LPwQA6REi/9lu3C5QUw0RstPB9Ef4+MepQTE1LR8F82lUGpgE0NcLKAL2sXWzUcsGZ0YBSeNMjLdx7qIdsL4/DSQMdDZzQ/ukNw/JRPn38/Y6VxIBPU1DiFiaPxpUWnA2EwSUajCTJyNatVzFZsa8N3lOzwextjsFecy+mySFJahD+TV8q6J+g034Xnc6xhyt4tgYvq4SeYX5W2+Taxzvjlztigq0RkF25pQnoFERLys0BhYCmH0itSMKss8OT/q6WRAIbrac1eSKJoJBEjnyTwPbk5T8PhG+N8NJI+BtTpKvivUiMaYGVs5Ndb6AUDxtaDwS4UU8VDVIIstjxdiK2EgE5ymo= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a9ca918-4932-4d93-68bb-08d7fdd34c7c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 May 2020 22:07:06.1145 (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: wSCGBNGt07VAxpWZY68v/MZ4WJXLlQZeEqnZP8MUWh/l/sV6om95UAFN71P+BIzq4w+5Qw76QzAWxXsv+GlDTa5M9OUAjJX2/NkF572jSts= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5512 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.7.104; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-HE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/21 18:07:01 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, quintela@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, Andrey Shinkevich , den@openvz.org, jsnow@redhat.com, dgilbert@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 04a5525fd1..65f2948f07 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("Bitmap '%s' in unnamed node can't be migrated", + bdrv_dirty_bitmap_name(bitmap)); + 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