From nobody Tue Feb 10 13:16:30 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=1681998653; cv=none; d=zohomail.com; s=zohoarc; b=iyTnwMtNqYXrXk2KkHSkisb1LLM63PIBrgZnvguNda92+JgXUBQHoSosTV+Z+6rrMDEDsLAXZ+DSLZSJQ1EF2Kk2pi+g+PBerXKgI/0f17PlmfKVaNjFf3kANE9E7SSnAGbT+Utt+Yi92IOncibsvk4fe78FjTS0QgMs6K+CMSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681998653; 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=7iuAp3CAA3aqL7BmtPkAn+nv94zFgdW4bZXzhU61HbE=; b=AGq5gxEK8PoVERnsoxnOSzUPy8l9DcYmyP0r3I7sB3NPv77CNxUketh19Y3F3YbFA65Y8+isu6J8YFNPP5owsIm/x560aTJzJVXFmVJxGXqiyZdYEAD+SPaFfbOO0I0tqyFfipAJTqstT+84feASUhcNFP3pk5G5ZBVMsakUgYU= 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 1681998653273745.6539970590396; Thu, 20 Apr 2023 06:50:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppUYu-0001Od-8W; Thu, 20 Apr 2023 09:43:00 -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 1ppUYF-0007pb-S4 for qemu-devel@nongnu.org; Thu, 20 Apr 2023 09:42:20 -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 1ppUYB-0006On-6P for qemu-devel@nongnu.org; Thu, 20 Apr 2023 09:42:18 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-343-ZDqoWtwiOz2zq0oN6sZDMw-1; Thu, 20 Apr 2023 09:42:10 -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 E2BB6185A78B; Thu, 20 Apr 2023 13:42:09 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.171]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E2094020BF1; Thu, 20 Apr 2023 13:42:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681998134; 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=7iuAp3CAA3aqL7BmtPkAn+nv94zFgdW4bZXzhU61HbE=; b=V1TUwSEEYiM8GelNoXuKD+WhUrjngqQRBX7+wU1+8/C9HTGuns11Ljcm8I7f/XhEWqhgLU C45Mj7cfNiC7eEzCN4o2yzv32ilq1TnP9k3QY1a0MJX+6pL+S0xkDLu3IWLJ5jQRC59jhv dfEPCstS41IFuV3Qy7+E6wLQUZ1R35Y= X-MC-Unique: ZDqoWtwiOz2zq0oN6sZDMw-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Peter Xu , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , David Hildenbrand , John Snow , Fam Zheng , Hailiang Zhang , "Michael S. Tsirkin" , qemu-block@nongnu.org, Gerd Hoffmann , Vladimir Sementsov-Ogievskiy , Leonardo Bras , Markus Armbruster , Stefan Hajnoczi , Juan Quintela , Eric Blake Subject: [PATCH v2 42/43] migration: Create migrate_block_bitmap_mapping() function Date: Thu, 20 Apr 2023 15:40:01 +0200 Message-Id: <20230420134002.29531-43-quintela@redhat.com> In-Reply-To: <20230420134002.29531-1-quintela@redhat.com> References: <20230420134002.29531-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: 1681998653906100005 Content-Type: text/plain; charset="utf-8" Notice that we changed the test of ->has_block_bitmap_mapping for the test that block_bitmap_mapping is not NULL. Signed-off-by: Juan Quintela --- migration/block-dirty-bitmap.c | 14 ++++++++------ migration/options.c | 7 +++++++ migration/options.h | 1 + 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index a6ffae0002..62b2352bbb 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -605,11 +605,12 @@ static int init_dirty_bitmap_migration(DBMSaveState *= s) SaveBitmapState *dbms; GHashTable *handled_by_blk =3D g_hash_table_new(NULL, NULL); BlockBackend *blk; - const MigrationParameters *mig_params =3D &migrate_get_current()->para= meters; GHashTable *alias_map =3D NULL; + BitmapMigrationNodeAliasList *block_bitmap_mapping =3D + migrate_block_bitmap_mapping(); =20 - if (mig_params->has_block_bitmap_mapping) { - alias_map =3D construct_alias_map(mig_params->block_bitmap_mapping= , true, + if (block_bitmap_mapping) { + alias_map =3D construct_alias_map(block_bitmap_mapping, true, &error_abort); } =20 @@ -1158,7 +1159,8 @@ 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 MigrationParameters *mig_params =3D &migrate_get_current()->para= meters; + BitmapMigrationNodeAliasList *block_bitmap_mapping =3D + migrate_block_bitmap_mapping(); DBMLoadState *s =3D &((DBMState *)opaque)->load; int ret =3D 0; =20 @@ -1170,8 +1172,8 @@ static int dirty_bitmap_load(QEMUFile *f, void *opaqu= e, int version_id) return -EINVAL; } =20 - if (mig_params->has_block_bitmap_mapping) { - alias_map =3D construct_alias_map(mig_params->block_bitmap_mapping, + if (block_bitmap_mapping) { + alias_map =3D construct_alias_map(block_bitmap_mapping, false, &error_abort); } =20 diff --git a/migration/options.c b/migration/options.c index 8f0bf1ece6..7a8fb4578a 100644 --- a/migration/options.c +++ b/migration/options.c @@ -454,6 +454,13 @@ void qmp_migrate_set_capabilities(MigrationCapabilityS= tatusList *params, =20 /* parameters */ =20 +BitmapMigrationNodeAliasList *migrate_block_bitmap_mapping(void) +{ + MigrationState *s =3D migrate_get_current(); + + return s->parameters.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 2f21837094..6b9ad7bae4 100644 --- a/migration/options.h +++ b/migration/options.h @@ -62,6 +62,7 @@ bool migrate_cap_set(int cap, bool value, Error **errp); =20 /* parameters */ =20 +BitmapMigrationNodeAliasList *migrate_block_bitmap_mapping(void); bool migrate_block_incremental(void); uint32_t migrate_checkpoint_delay(void); int migrate_compress_level(void); --=20 2.39.2