From nobody Tue May 14 06:39:04 2024 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=1683137491; cv=none; d=zohomail.com; s=zohoarc; b=OFfFwAzDUBP8kOzTmcS8VnVXRf5PiPxNugfsTAPAcMpJonwRApbzVQ5j7lg4Q44Pr891PjiA5NP80jDO3u0UKfQes4Jx8sSMAL63UTR3O0PeGzJGAZgNH1SUFV8iLhzwsm7Nfz/53LvWDTfK5i8RYCKL2Zy0KJiKRYW5TKH01ZI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683137491; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=JfDaEI3U4n5PTwuH6j3FWMNWpf0PoVFrz/Xr2ZTFfY4=; b=MlsjGEgXnAAt4DZ29qamwiccoKRYZOzNYk5eL2l7p6PVa7hUWFLHnlFoG4+g+M1qhZ+qaJCl8nF4Gfj97oS+5Zr3FsYFPwTv3WagwcDZtrUGj27q7Yyi4glT/erHcUrv7RUZJp4GnkHRACTK6Bli8Sep8XoljEHWTRSRhfeEDFA= 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 1683137491875900.029165736237; Wed, 3 May 2023 11:11:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puGwG-0006Oh-95; Wed, 03 May 2023 14:10:52 -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 1puGwB-0006Jn-A6 for qemu-devel@nongnu.org; Wed, 03 May 2023 14:10:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puGw9-0006o5-MM for qemu-devel@nongnu.org; Wed, 03 May 2023 14:10:47 -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-522-cJjbQP0MOAGUQOsksizUcg-1; Wed, 03 May 2023 14:10:40 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5C30D3C10C68; Wed, 3 May 2023 18:10:39 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50674492B00; Wed, 3 May 2023 18:10:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683137444; 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; bh=JfDaEI3U4n5PTwuH6j3FWMNWpf0PoVFrz/Xr2ZTFfY4=; b=Kg8LtXNcInGkSvJZhGC9MXK1DAbHopZ8eZhHu5gkc4s5ND072DnpTveQd51UFAk492MCmq OZRhTWkj/rcAbFGnwhjA/7vdVqHYBd8momPNEf+l2lA9rgXkFqMIn04UY7cWzTo77aGRRa bsb38GUX+aBRddx49nkk/PzoImyCrMc= X-MC-Unique: cJjbQP0MOAGUQOsksizUcg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Peter Xu , qemu-block@nongnu.org, Leonardo Bras , Juan Quintela , Vladimir Sementsov-Ogievskiy , Fam Zheng , Eric Blake , John Snow , Kevin Wolf Subject: [PATCH] migration: Fix block_bitmap_mapping migration Date: Wed, 3 May 2023 20:10:36 +0200 Message-Id: <20230503181036.14890-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.133.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_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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: 1683137494434100001 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 Signed-off-by: Juan Quintela Reviewed-by: Vladimir Sementsov-Ogievskiy --- 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