From nobody Wed Feb 11 01:09:31 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1683247897; cv=none; d=zohomail.com; s=zohoarc; b=eivFZjXjUoofytOJ4poIMzxR3AUaN5jB2Jcc2Fq9/YOYMJAqtGYWCe6MIXOVW3EFGcZHMIvattChQLgew3qEisJPQNNRCvk6zig714l+Rpz83N8JbzlF+KTWLCmkcqwP3wKmAsAuUBpaMiKosKgJKo5ht+6BIA3G7L3zDz3l1ig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683247897; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6rB1KZ0u3Ndgy61yBxUx9qHqRuPMGVsTrUzb+7ibAEU=; b=GhtkuK0CvIZxyx4BXqo3zUvtIP5jSYPR6TkTas/GHW92nt8IbVCGngccBoFtw45zDa8jopv6T/Z1ZtWI7gGysAUh0mSmxMpOcZltqn8dWihlLeHD5hvsfdnB1Z2Ru7aaXDcw5CZIfG9RJjVwFN1rDljWRSK+IaU6KVBF1pOihK4= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683247897677505.5664945364839; Thu, 4 May 2023 17:51:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pujcc-00043g-6M; Thu, 04 May 2023 20:48:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pujca-0003zO-1m for qemu-devel@nongnu.org; Thu, 04 May 2023 20:48:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pujcU-0000hi-Pi for qemu-devel@nongnu.org; Thu, 04 May 2023 20:48:27 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-25-fBY4ljF3MZO3EHCINddg_A-1; Thu, 04 May 2023 20:48:19 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 065F91C068D2; Fri, 5 May 2023 00:48:18 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25130404B24D; Fri, 5 May 2023 00:48:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683247701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6rB1KZ0u3Ndgy61yBxUx9qHqRuPMGVsTrUzb+7ibAEU=; b=cgaFTGz88/e9Mv0RfMpClRK44/ughGOC5jbEvcjmnQA36PsLB5muI8LprY5pNclwHHK60K rzgIehDpo4ulwN76ffgUb99GwzhZXkUsffTkAHycMyj/N9I6zbEmpk6npJx/FdhyGMEGxD lxdGkFf1RI6EgKU983idT2PfCWyxoak= X-MC-Unique: fBY4ljF3MZO3EHCINddg_A-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Eric Blake , Vladimir Sementsov-Ogievskiy , Stefan Hajnoczi , John Snow , Juan Quintela , qemu-block@nongnu.org, Leonardo Bras , Fam Zheng , Peter Xu , Kevin Wolf Subject: [PULL 01/16] migration: Fix block_bitmap_mapping migration Date: Fri, 5 May 2023 02:47:57 +0200 Message-Id: <20230505004812.31583-2-quintela@redhat.com> In-Reply-To: <20230505004812.31583-1-quintela@redhat.com> References: <20230505004812.31583-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.161, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683247897983100001 Content-Type: text/plain; charset="utf-8" It is valid that params->has_block_bitmap_mapping is true and params->block_bitmap_mapping is NULL. So we can't use the trick of having a single function. Move to two functions one for each value and the tests are fixed. Fixes: b804b35b1c8a0edfd127ac20819c234be55ac7fc migration: Create migrate_block_bitmap_mapping() function Reported-by: Kevin Wolf Reviewed-by: Vladimir Sementsov-Ogievskiy Message-Id: <20230503181036.14890-1-quintela@redhat.com> Signed-off-by: Juan Quintela --- migration/block-dirty-bitmap.c | 14 +++++--------- migration/options.c | 7 +++++++ migration/options.h | 2 ++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index 6624f39bc6..20f36e6bd8 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -606,11 +606,9 @@ static int init_dirty_bitmap_migration(DBMSaveState *s) GHashTable *handled_by_blk =3D g_hash_table_new(NULL, NULL); BlockBackend *blk; GHashTable *alias_map =3D NULL; - const BitmapMigrationNodeAliasList *block_bitmap_mapping =3D - migrate_block_bitmap_mapping(); =20 - if (block_bitmap_mapping) { - alias_map =3D construct_alias_map(block_bitmap_mapping, true, + if (migrate_has_block_bitmap_mapping()) { + alias_map =3D construct_alias_map(migrate_block_bitmap_mapping(), = true, &error_abort); } =20 @@ -1159,8 +1157,6 @@ static int dirty_bitmap_load_header(QEMUFile *f, DBML= oadState *s, static int dirty_bitmap_load(QEMUFile *f, void *opaque, int version_id) { GHashTable *alias_map =3D NULL; - const BitmapMigrationNodeAliasList *block_bitmap_mapping =3D - migrate_block_bitmap_mapping(); DBMLoadState *s =3D &((DBMState *)opaque)->load; int ret =3D 0; =20 @@ -1172,9 +1168,9 @@ static int dirty_bitmap_load(QEMUFile *f, void *opaqu= e, int version_id) return -EINVAL; } =20 - if (block_bitmap_mapping) { - alias_map =3D construct_alias_map(block_bitmap_mapping, - false, &error_abort); + if (migrate_has_block_bitmap_mapping()) { + alias_map =3D construct_alias_map(migrate_block_bitmap_mapping(), = false, + &error_abort); } =20 do { diff --git a/migration/options.c b/migration/options.c index 53b7fc5d5d..7395787960 100644 --- a/migration/options.c +++ b/migration/options.c @@ -626,6 +626,13 @@ const BitmapMigrationNodeAliasList *migrate_block_bitm= ap_mapping(void) return s->parameters.block_bitmap_mapping; } =20 +bool migrate_has_block_bitmap_mapping(void) +{ + MigrationState *s =3D migrate_get_current(); + + return s->parameters.has_block_bitmap_mapping; +} + bool migrate_block_incremental(void) { MigrationState *s =3D migrate_get_current(); diff --git a/migration/options.h b/migration/options.h index 3c322867cd..09841d6a63 100644 --- a/migration/options.h +++ b/migration/options.h @@ -71,6 +71,8 @@ bool migrate_cap_set(int cap, bool value, Error **errp); /* parameters */ =20 const BitmapMigrationNodeAliasList *migrate_block_bitmap_mapping(void); +bool migrate_has_block_bitmap_mapping(void); + bool migrate_block_incremental(void); uint32_t migrate_checkpoint_delay(void); int migrate_compress_level(void); --=20 2.40.0