From nobody Fri Dec 19 17:10:04 2025 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1744811114; cv=none; d=zohomail.com; s=zohoarc; b=ThLWRB/kF4DRz55S0fFQHu3Cn6kF7xkRozRMF/8egC8g18HxkUgp91Tyw0bzaWmhwQr7QwCaxxa6fahpwP9Ed0lYbcfJ/k67NnE9pkxQeeVZSDzS2KDgNRFwY/nCIG9km21vE1z759furZ3TdX8dD1faJpDNqV4blWqR/vf2TvE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744811114; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0VT7M2iwpTi7wX2zxfXYkAAhTkv8rAUPmL6gfxSYd9I=; b=MqEmvYwVB94HRbdfIHSTq2PU+obqR3iJmyecmjbViMCwgiR5KwQDoP6jZoHjJA4DDcC0K0/2c7jPSMa4SrshesreRVMUWr77MilZkOOBIz2jtM1IBdxDHa601puzP5Y3Zn+JbqkbVst2nqA49PUr2qcEn8gbvZNHcfz0nAD2J34= 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 1744811114438662.7188069840334; Wed, 16 Apr 2025 06:45:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5340-0005F8-ES; Wed, 16 Apr 2025 09:44:28 -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 1u533l-0005Ct-Uo for qemu-devel@nongnu.org; Wed, 16 Apr 2025 09:44:15 -0400 Received: from smtp-out2.suse.de ([195.135.223.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u533k-00069R-2R for qemu-devel@nongnu.org; Wed, 16 Apr 2025 09:44:13 -0400 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id D64831F745; Wed, 16 Apr 2025 13:44:04 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id C02D813A39; Wed, 16 Apr 2025 13:44:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 6N9FHyO0/2czQQAAD6G6ig (envelope-from ); Wed, 16 Apr 2025 13:44:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1744811044; h=from:from:reply-to: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=0VT7M2iwpTi7wX2zxfXYkAAhTkv8rAUPmL6gfxSYd9I=; b=oyJsJa8szgV7YWhVmNTN9f/v96JZKUtDgTzDsSdlImiLiqNBZBCulUwnaVK4Cgekm1iEMe vXgNa6OYwnef4k815EF5iM0jKXl7UhFjsZ8NBMFVrPNw3K3tZ0NcVchZv0s8ZKh9NrXYpE WtR8S8YnUrdxJYVxDzQwp83H3XkLpB4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1744811044; h=from:from:reply-to: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=0VT7M2iwpTi7wX2zxfXYkAAhTkv8rAUPmL6gfxSYd9I=; b=XP2nq+bkF5aAR9FVm/z1s9W/qM+BhFGVBhfGM1cGvGITUrW09Xkuq9TdZObAXgetxdOryH OekIY5/FoSy1VxDQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=oyJsJa8s; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=XP2nq+bk DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1744811044; h=from:from:reply-to: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=0VT7M2iwpTi7wX2zxfXYkAAhTkv8rAUPmL6gfxSYd9I=; b=oyJsJa8szgV7YWhVmNTN9f/v96JZKUtDgTzDsSdlImiLiqNBZBCulUwnaVK4Cgekm1iEMe vXgNa6OYwnef4k815EF5iM0jKXl7UhFjsZ8NBMFVrPNw3K3tZ0NcVchZv0s8ZKh9NrXYpE WtR8S8YnUrdxJYVxDzQwp83H3XkLpB4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1744811044; h=from:from:reply-to: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=0VT7M2iwpTi7wX2zxfXYkAAhTkv8rAUPmL6gfxSYd9I=; b=XP2nq+bkF5aAR9FVm/z1s9W/qM+BhFGVBhfGM1cGvGITUrW09Xkuq9TdZObAXgetxdOryH OekIY5/FoSy1VxDQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu Subject: [PATCH 1/2] migration/multifd: Fix received packets tracepoint Date: Wed, 16 Apr 2025 10:43:55 -0300 Message-Id: <20250416134356.29879-2-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20250416134356.29879-1-farosas@suse.de> References: <20250416134356.29879-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: D64831F745 X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_TRACE(0.00)[0:+]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_DN_SOME(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received,2a07:de40:b281:104:10:150:64:97:from]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email, suse.de:dkim, suse.de:mid, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action X-Spam-Score: -3.01 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=195.135.223.131; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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 @suse.de) X-ZM-MESSAGEID: 1744811116831019100 Content-Type: text/plain; charset="utf-8" When qatomic_fetch_inc() started being used to count the number of packets sent, the printing of the number of packets received stopped matching the number of packets sent. Fix by moving the increment of the number of packets on the recv side to multifd_recv_unfill_packet(). Also change the tracepoint text because "packet num" is ambiguous for the sync since the packet number of the actual sync packet will be one less than the total number of packets seen so far. Fixes: 98ea497d8b ("migration/multifd: Fix MultiFDSendParams.packet_num rac= e") Signed-off-by: Fabiano Rosas --- migration/multifd.c | 6 +----- migration/trace-events | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index dfb5189f0e..1a16155864 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -310,6 +310,7 @@ static int multifd_recv_unfill_packet_ram(MultiFDRecvPa= rams *p, Error **errp) =20 static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp) { + qatomic_inc(&multifd_recv_state->packet_num); p->packets_recved++; =20 if (p->flags & MULTIFD_FLAG_DEVICE_STATE) { @@ -1222,11 +1223,6 @@ void multifd_recv_sync_main(void) for (i =3D 0; i < thread_count; i++) { MultiFDRecvParams *p =3D &multifd_recv_state->params[i]; =20 - WITH_QEMU_LOCK_GUARD(&p->mutex) { - if (multifd_recv_state->packet_num < p->packet_num) { - multifd_recv_state->packet_num =3D p->packet_num; - } - } trace_multifd_recv_sync_main_signal(p->id); qemu_sem_post(&p->sem_sync); } diff --git a/migration/trace-events b/migration/trace-events index c506e11a2e..48acb126f5 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -133,7 +133,7 @@ multifd_new_send_channel_async(uint8_t id) "channel %u" multifd_new_send_channel_async_error(uint8_t id, void *err) "channel=3D%u = err=3D%p" multifd_recv_unfill(uint8_t id, uint64_t packet_num, uint32_t flags, uint3= 2_t next_packet_size) "channel %u packet_num %" PRIu64 " flags 0x%x next pa= cket size %u" multifd_recv_new_channel(uint8_t id) "channel %u" -multifd_recv_sync_main(long packet_num) "packet num %ld" +multifd_recv_sync_main(long packet_num) "packets before sync %ld" multifd_recv_sync_main_signal(uint8_t id) "channel %u" multifd_recv_sync_main_wait(uint8_t id) "iter %u" multifd_recv_terminate_threads(bool error) "error %d" @@ -142,7 +142,7 @@ multifd_recv_thread_start(uint8_t id) "%u" multifd_send_fill(uint8_t id, uint64_t packet_num, uint32_t flags, uint32_= t next_packet_size) "channel %u packet_num %" PRIu64 " flags 0x%x next pack= et size %u" multifd_send_ram_fill(uint8_t id, uint32_t normal, uint32_t zero) "channel= %u normal pages %u zero pages %u" multifd_send_error(uint8_t id) "channel %u" -multifd_send_sync_main(long packet_num) "packet num %ld" +multifd_send_sync_main(long packet_num) "packets before sync %ld" multifd_send_sync_main_signal(uint8_t id) "channel %u" multifd_send_sync_main_wait(uint8_t id) "channel %u" multifd_send_terminate_threads(void) "" --=20 2.35.3 From nobody Fri Dec 19 17:10:04 2025 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1744811109; cv=none; d=zohomail.com; s=zohoarc; b=GIamkudAY8P6CsLWE7S4cCxko4tpHyTMtt0k0HaSWbOOj+YBEh797FEjBn2YhxkBX7AFi2c4OAhlW6OG0+BLEiw4L1qL8jwUqTYRc2MZnyvm6naRsXL8nocn8ZyONYxJndGknMr1e+KiG6oebxpiTHhg/RkRQWfn1nAMXgGuxP0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744811109; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jxlfOf6Lg8XKT/rYFTB01aW6q7bFd3J6Ggpw2jHwpmg=; b=Z3InUiGcpHdlOXk9BdNfXJmb3qM91pOGZWkDsvcMuWSK9yc/8UncGBvN9eUbj8RmGuDaHK1gCPTE253gFXwzOZTpmWVUDtCmbeUNtLvipXM95yPkUi8kAjswsJHslN1wXqri1o0eZw+lD3uwNFfOZYx3JK+ZNbqzOjcF/AYyXVg= 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 1744811109271867.44276952821; Wed, 16 Apr 2025 06:45:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u533v-0005Dd-Kp; Wed, 16 Apr 2025 09:44:26 -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 1u533i-0005CL-1P for qemu-devel@nongnu.org; Wed, 16 Apr 2025 09:44:11 -0400 Received: from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u533f-00068q-TP for qemu-devel@nongnu.org; Wed, 16 Apr 2025 09:44:09 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 7059C2118E; Wed, 16 Apr 2025 13:44:06 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 5D04C13976; Wed, 16 Apr 2025 13:44:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id oHgDByW0/2czQQAAD6G6ig (envelope-from ); Wed, 16 Apr 2025 13:44:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1744811046; h=from:from:reply-to: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=jxlfOf6Lg8XKT/rYFTB01aW6q7bFd3J6Ggpw2jHwpmg=; b=mIlPSKeIP5g9T4i5MaFBHMgvn1slEnLc04/ZovOdTOhAxSYAoZwRKe+Y2WiMnuea9Yh+hu I3HI/oF+YGqz6e6zqhqgGkLZMaKMs5ibkzRX3itYRMCp05aGMSh6Ktz0N2nvA3j7js60lp GsNJgRGsmyJHAdFe0/PhIpUAk8eenPE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1744811046; h=from:from:reply-to: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=jxlfOf6Lg8XKT/rYFTB01aW6q7bFd3J6Ggpw2jHwpmg=; b=nkd+y5/8s8zHr6XLOh4Qq4XKbke6MhNEKilhdELaowXExjRidR/fSAXo3M80jvD9KcVgVr S7dCnYGpQXxNb6CQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1744811046; h=from:from:reply-to: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=jxlfOf6Lg8XKT/rYFTB01aW6q7bFd3J6Ggpw2jHwpmg=; b=mIlPSKeIP5g9T4i5MaFBHMgvn1slEnLc04/ZovOdTOhAxSYAoZwRKe+Y2WiMnuea9Yh+hu I3HI/oF+YGqz6e6zqhqgGkLZMaKMs5ibkzRX3itYRMCp05aGMSh6Ktz0N2nvA3j7js60lp GsNJgRGsmyJHAdFe0/PhIpUAk8eenPE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1744811046; h=from:from:reply-to: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=jxlfOf6Lg8XKT/rYFTB01aW6q7bFd3J6Ggpw2jHwpmg=; b=nkd+y5/8s8zHr6XLOh4Qq4XKbke6MhNEKilhdELaowXExjRidR/fSAXo3M80jvD9KcVgVr S7dCnYGpQXxNb6CQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu Subject: [PATCH 2/2] migration: Trivial cleanups for postcopy Date: Wed, 16 Apr 2025 10:43:56 -0300 Message-Id: <20250416134356.29879-3-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20250416134356.29879-1-farosas@suse.de> References: <20250416134356.29879-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.80 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_TWO(0.00)[2]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:email]; RCVD_TLS_ALL(0.00)[] 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=2a07:de40:b251:101:10:150:64:1; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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 @suse.de) X-ZM-MESSAGEID: 1744811109773019000 Content-Type: text/plain; charset="utf-8" Some general cleanups of silly things that were left behind when refactoring code. Signed-off-by: Fabiano Rosas --- migration/migration.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index d46e776e24..89b1de0ab5 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2732,19 +2732,15 @@ static int postcopy_start(MigrationState *ms, Error= **errp) } =20 /* - * in Finish migrate and with the io-lock held everything should + * in FINISH_MIGRATE and with the BQL held everything should * be quiet, but we've potentially still got dirty pages and we * need to tell the destination to throw any pages it's already receiv= ed * that are dirty */ - if (migrate_postcopy_ram()) { - ram_postcopy_send_discard_bitmap(ms); - } + ram_postcopy_send_discard_bitmap(ms); =20 - if (migrate_postcopy_ram()) { - /* Ping just for debugging, helps line traces up */ - qemu_savevm_send_ping(ms->to_dst_file, 2); - } + /* Ping just for debugging, helps line traces up */ + qemu_savevm_send_ping(ms->to_dst_file, 2); =20 /* * While loading the device state we may trigger page transfer @@ -2774,9 +2770,7 @@ static int postcopy_start(MigrationState *ms, Error *= *errp) goto fail_closefb; } =20 - if (migrate_postcopy_ram()) { - qemu_savevm_send_ping(fb, 3); - } + qemu_savevm_send_ping(fb, 3); =20 qemu_savevm_send_postcopy_run(fb); =20 @@ -2807,13 +2801,11 @@ static int postcopy_start(MigrationState *ms, Error= **errp) =20 migration_downtime_end(ms); =20 - if (migrate_postcopy_ram()) { - /* - * Although this ping is just for debug, it could potentially be - * used for getting a better measurement of downtime at the source. - */ - qemu_savevm_send_ping(ms->to_dst_file, 4); - } + /* + * Although this ping is just for debug, it could potentially be + * used for getting a better measurement of downtime at the source. + */ + qemu_savevm_send_ping(ms->to_dst_file, 4); =20 if (migrate_release_ram()) { ram_postcopy_migrated_memory_release(ms); --=20 2.35.3