From nobody Fri Dec 19 20:37:54 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=lukasstraub2@web.de; 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=web.de ARC-Seal: i=1; a=rsa-sha256; t=1687436314; cv=none; d=zohomail.com; s=zohoarc; b=YIC4tjedTmRXyqqcjFNgCxGwQ8uEDfm2ZzwLN2KYiPT8lB4CttzuaLTbJUP4SlzNRd/7rVQMz8H5+PUKrwbNf6Ufs5RdheDycf5meFGO5Kl6MHciUW+PCleYTeB/+XFfP715WbdmkfK8LpMCGs6V/0ruKkENIvINzepvzujBcYQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687436314; h=Content-Type: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=q4vA61byjS0IYVoZtB48jf7bU7iQPRxep+A9F4ujrmg=; b=ZMUG0rmNoFb4V26RkAU14CfgmnVrcPPGuUbm/wpkEQp8qmrdHjwfoUtyNRonIbhWv0WLAcVcDBuqfsOYMx5MX+zLM7LopuBmIRJ48uYiI1LuGIFH2xPf0+u3GeoxgMWt1nPC1ECXt0I3qAJJeAYjFFxQN99MyaUPsFzAQiCerI4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=lukasstraub2@web.de; 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 1687436314892627.0742437983591; Thu, 22 Jun 2023 05:18:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCJEz-0003kG-Ev; Thu, 22 Jun 2023 08:16:45 -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 1qCJE8-0002l1-SN for qemu-devel@nongnu.org; Thu, 22 Jun 2023 08:15:53 -0400 Received: from mout.web.de ([212.227.15.4]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCJE4-0004kL-RB for qemu-devel@nongnu.org; Thu, 22 Jun 2023 08:15:51 -0400 Received: from mobian ([141.58.32.133]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MoNZM-1pjmxV2xei-00obHZ; Thu, 22 Jun 2023 14:15:37 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1687436137; x=1688040937; i=lukasstraub2@web.de; bh=OClwFk1QdVOr62kEg2FxJDxzv/XBVt3YzwoglM/RjDs=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=amg6OTA4drXAOQJJlNGQurMl4HCeYG5Vn1L6EGq3bu/dilspZFSn6YBtUZoYwSgqGOQU4bb Kdt/1TIkdBD2c9PLZ1EzF5zNKXjKOBM+FfhOnkDmEDesZY5luwe30Je5ERDhj0PS+sJI9CYGb Fq7g3lasitw2NBF4dPswcpAeLQxiOho39TKGB8jtJbkYyMk2ZzrkZpCwZybEnh0qdDsk6mvZv MRAFWisl1rqv386P0SRcBDv+bLSn47VoIWaECRfyBC8LMCHxl5FlI9PmJw6w2+DlByt2/su+a GZii6bVT6UdnXpjLJdEIs58MJPmhGAZxWKP7rCIKFxZjRT5EujFg== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Date: Thu, 22 Jun 2023 14:15:34 +0200 From: Lukas Straub To: qemu-devel Cc: Hailiang Zhang , Juan Quintela , Peter Xu , Leonardo Bras , "Zhang, Chen" Subject: [PATCH 3/8] colo: Replace migration_incoming_colo_enabled() with migrate_colo() Message-ID: <1e6ab707c554a5ae8aa7497cc988f5032a2d1351.1687429356.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/FXU4NaZA5V_GSmL9Q/US199"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:mUZnEJfguqMtFbYK2OgayIraqHIGf4uDj6rgbT4/3VLiT7UO1hS r5kvZaePRAzlrUA7uWSqIRAKrRL/ZpH26Re90HwOJiWsMDl8EEXf/C68bTVtO+pKGqEzoLd xC4gODeRdiKw4RL28R0KWngT3APnUq5nh9hFOM7g1mMAVqLEY2Nfoy8BKina6noTEk9mFmq N6oXefg7iVxs2jSQcarTA== UI-OutboundReport: notjunk:1;M01:P0:QYi0jRSvt2A=;tp72257pT2Izp7lMKvbsnLGskfD w5itNrK62lZNAWYDZDAhUMH+8EsiUm7u0WLjkTDC2wYSohMgFOoF0mZHYr8cgGULgpAY8j0vN uOKar6W91LIBZvyJpmRmPWDs0NHSzwpCw72guIaa57ctO+Rk2NGPrpjtf82b2JR5qzV9/BoE3 L0rsudulnZEnK5dwIVBnliqLeWMXqeTrg0+LqQhh1ooz04KdlfV2JhW8j7CmJFXtUAz9l0ptr uP9rrk+lfX/p1VPlhVTTdIvQksR2VtcdchpteVO1BpmSHhVWeUbnM84uWvWUfwxJuvA97Nbhd zA6o2xdKHe7n0TIJqe7vkznaE/Lcm///2JYDpeTZ8m3jLpJYlhMhjcC3Yv/56vJ27BrV3OLGb pJp9iqNp9+EPQnK4JFvdl50tcMj5E0RgSKbLdqrMMyycI3G8FuTeXLNJ9nmFB96I2U+DRJdBa tt2KOhHZOTwjyd5UiGscjIaG6Vzmq11PiDR3BjEaNKyZh7eNcBXRQFZaC7sS/kBor1xuQToWx 0DBmM/27yRZINiZIN1Fvs9XwwFvLd8VktidUAAZ94DK+jsXPSb/cBQ732CC5AkRxi0K6FiDQX 6Kdn5IfjCEeYJE/DVV6oEZb1V4KOxCVxJ3AmxrgAWr6rSTNiU8LZrvtQ9BMBqSe+caajMLHuG vPpJbjIdZb1dkUtqXTyKpFoKazFUeAxfUUiI5soI2C0gDf4U4uFKJllS5f17Zd6CpUpXff+xT QbIfQLvnhFQuLJcj4Mw4AWVVr6VA+qUnYP13czKT0ZXyJpAMZN3dDUpl4IW7hpDknzTtydLSu VIs6MnwI1wHS28eX2YMQBAoU4aAsOqwsBpG14e8ru2JUOwB9UdqjlIjQF8KxoH+0FSNX7MzNw tUHZYrwpaTwR216QkNf2OyZzWnzRCM9eTA5mZAD1H/bsQAdL8q1iyDg9i9CqHnkgF543flEOt w84DTG0YFukGUIU4qBPZ9I4vlAw= 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=212.227.15.4; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: pass (identity lukasstraub2@web.de) X-ZM-MESSAGEID: 1687436316557100005 --Sig_/FXU4NaZA5V_GSmL9Q/US199 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Lukas Straub --- include/migration/colo.h | 1 - migration/colo.c | 2 +- migration/migration.c | 7 +------ migration/ram.c | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/include/migration/colo.h b/include/migration/colo.h index eaac07f26d..4a1955067b 100644 --- a/include/migration/colo.h +++ b/include/migration/colo.h @@ -27,7 +27,6 @@ bool migration_in_colo_state(void); /* loadvm */ int migration_incoming_enable_colo(void); void migration_incoming_disable_colo(void); -bool migration_incoming_colo_enabled(void); bool migration_incoming_in_colo_state(void); =20 COLOMode get_colo_mode(void); diff --git a/migration/colo.c b/migration/colo.c index 72f4f7b37e..8b0e7c9af3 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -927,7 +927,7 @@ int coroutine_fn colo_incoming_co(void) =20 assert(qemu_mutex_iothread_locked()); =20 - if (!migration_incoming_colo_enabled()) { + if (!migrate_colo()) { return 0; } =20 diff --git a/migration/migration.c b/migration/migration.c index 050bd8ffc8..2506fd63f7 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -379,11 +379,6 @@ int migrate_send_rp_req_pages(MigrationIncomingState *= mis, } =20 static bool migration_colo_enabled; -bool migration_incoming_colo_enabled(void) -{ - return migration_colo_enabled; -} - void migration_incoming_disable_colo(void) { ram_block_discard_disable(false); @@ -484,7 +479,7 @@ static void process_incoming_migration_bh(void *opaque) } else { runstate_set(RUN_STATE_PAUSED); } - } else if (migration_incoming_colo_enabled()) { + } else if (migrate_colo()) { migration_incoming_disable_colo(); vm_start(); } else { diff --git a/migration/ram.c b/migration/ram.c index 5283a75f02..e3eadd08cd 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3892,7 +3892,7 @@ static int ram_load_precopy(QEMUFile *f) * speed of the migration, but it obviously reduce the downtim= e of * back-up all SVM'S memory in COLO preparing stage. */ - if (migration_incoming_colo_enabled()) { + if (migrate_colo()) { if (migration_incoming_in_colo_state()) { /* In COLO stage, put all pages into cache temporarily= */ host =3D colo_cache_from_block_offset(block, addr, tru= e); --=20 2.39.2 --Sig_/FXU4NaZA5V_GSmL9Q/US199 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAmSUO2YACgkQNasLKJxd slj4RBAAgWe1S9q4tiX0yu2LgJPvmclNHDR62Z8s69Lqp6FSp1e78NssdyZGYLGO B7vneFm9TkoeSn4YmVObjyYaz7Zj9BWeSs97NL4v3vff44X2kai2WQNs1m/33rWn sHFBXU4mh/y6ZQnhssNkSHVlZRFyWMuSj/hYW6KL5yi160mC4jBnqFb9By1AgEne 6hqaSSLWoBZHBZMY8wT3Ywp6/ezoD6AQxsYZ0mG9knnaGbl9JYd/uQ6PvS1LLqUO IYBm1aUDxAG8mmfARrQS81ww8lVQm4LJSzJodRQ/Epz9PhHjvHFrbuIyRnqZtgj0 MaOOP6CHItOt7Skm3L2XPAV1uIQiGS4hwzIn8Z1TdiQa2oAgow/Cc4mYfVngn/me QCY33C8wLLLLUGcp37+qbRzBtfNd5d8o/ihnoaiPH+jXynrfeThV/cnN9/QwiShs MG8MMWx+JlzDgarUI5AZ4d1MolwD6QP4XR4WLpdyp/kWnfU7MAQ0ks1UKiDdVJTN YFVl1Fhpx/Akyezafx8sR41oEe1z5h99tFWnL3GgNuThjPfuPZBiKaz88nsbIvvD kte9dFcStMOtcf91LeC53M4K5dbrVglpWMatfeUUVWPo1uaBHTpjp5ksnbCzMB11 v//xI7pmymt9Q3J2Lar/u4qIiZ84Z30ljoyDeuXgh5RGU+P/muE= =BQ4u -----END PGP SIGNATURE----- --Sig_/FXU4NaZA5V_GSmL9Q/US199--