From nobody Tue Feb 10 21:40:22 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=1681336003; cv=none; d=zohomail.com; s=zohoarc; b=kFPiQNuzKW42WU7eQCs6BBjDAeYGDJ5tahLyuPdM7Kv2g4EvSjjKXfkDeCqWPCpvPcC0pKYDdPfQE/KNGzxPdKNsd+Letvm35DS9W5huPKPFjzxLU3s3iOMPCTyUTP8lscMb+//FXhQYL0wPMsE+JQaigwdHEegjE1LhQr8ZhrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681336003; 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=BPBrb53DmJ8CjbFG14nTeT2QuDHlsQDJHH5J8fjC+I0=; b=UR4D6Ujzkq+Ic29JG/BB7JqTB/ArH4OmkRSOgVrpgSP0Iax4k3XiP94I4XGoxv5rCyBJ9BLl23pX5l4QfrStMj57n5zGRaoe+RWEvmZrSoiIavLuXVl2ee3uX75aK3pDvDuUGir4v9H9kMwRfieJpUJAjn4ppSRl167YWZqrU8w= 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 1681336003267823.0767734614932; Wed, 12 Apr 2023 14:46:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmiHN-0008NZ-H4; Wed, 12 Apr 2023 17:45:25 -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 1pmiHM-0008N0-Ez for qemu-devel@nongnu.org; Wed, 12 Apr 2023 17:45:24 -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 1pmiHK-0006dF-W7 for qemu-devel@nongnu.org; Wed, 12 Apr 2023 17:45:24 -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-484-O-ElFES6MF2eXAxLxbhFQA-1; Wed, 12 Apr 2023 17:45:18 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 58A3A185A791; Wed, 12 Apr 2023 21:45:18 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D5451121320; Wed, 12 Apr 2023 21:45:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681335922; 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=BPBrb53DmJ8CjbFG14nTeT2QuDHlsQDJHH5J8fjC+I0=; b=LDSLdEXCTc1iPQbslbhinNBo4js9dZQf+B91cYjUiuGkjGNJ+ImZiC0Ko2TbUmsm57uPnP q/7zUoWmAxPGN86ZLUUAg97EqnTGClw2vYhOdk3r7MeGH9mt0Loh8YJtCGyM3UI4eGND+P wdBK81keF2jT6fzQ4OB+JcerPu9Vz/c= X-MC-Unique: O-ElFES6MF2eXAxLxbhFQA-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , Juan Quintela , Eduardo Habkost , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Nina Schoetterl-Glausch Subject: [PULL 5/5] migration: fix ram_state_pending_exact() Date: Wed, 12 Apr 2023 23:45:07 +0200 Message-Id: <20230412214507.19816-6-quintela@redhat.com> In-Reply-To: <20230412214507.19816-1-quintela@redhat.com> References: <20230412214507.19816-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: -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 autolearn=ham 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: 1681336003826100001 Content-Type: text/plain; charset="utf-8" I removed that bit on commit: commit c8df4a7aeffcb46020f610526eea621fa5b0cd47 Author: Juan Quintela Date: Mon Oct 3 02:00:03 2022 +0200 migration: Split save_live_pending() into state_pending_* Fixes: c8df4a7aeffcb46020f610526eea621fa5b0cd47 Suggested-by: Nina Schoetterl-Glausch Signed-off-by: Juan Quintela --- migration/ram.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 9d1817ab7b..79d881f735 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3506,12 +3506,13 @@ static void ram_state_pending_estimate(void *opaque= , uint64_t *must_precopy, static void ram_state_pending_exact(void *opaque, uint64_t *must_precopy, uint64_t *can_postcopy) { + MigrationState *s =3D migrate_get_current(); RAMState **temp =3D opaque; RAMState *rs =3D *temp; =20 uint64_t remaining_size =3D rs->migration_dirty_pages * TARGET_PAGE_SI= ZE; =20 - if (!migration_in_postcopy()) { + if (!migration_in_postcopy() && remaining_size < s->threshold_size) { qemu_mutex_lock_iothread(); WITH_RCU_READ_LOCK_GUARD() { migration_bitmap_sync_precopy(rs); --=20 2.39.2