From nobody Sun Feb 8 18:18:29 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1692110362; cv=none; d=zohomail.com; s=zohoarc; b=fZR33CJ/Ltiowcid9C2BL96PMaPrro5TXxDuJeP7gEv5fpzxYDR6MKhUhkvwbjaDePmKL0eDm5NY7rivfZCAcRKCVGcnCDS2oWx4jO6UDy0EnhiqV4A0lVHp2dJqfQ8NYGjMmCiqrmaF1yjPsWOdw+WzxfB2OqE4/rYualxhVW0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692110362; 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=YWnFxOqJ5bfCNylnJ+ZhPlU1d0lBVmUHReGGAQQY0uk=; b=fnjihc0Qglkdw3FNXHbeeiF/JXvNLrJBoynfdU+LJZOm5UQ1e4Jmm6sfxHOGBH+95VMzE7ww64j4Dy6hKiSmWao7dYBkP4BgF2NwTdcgeqCBRRCxPWV/XssMNV/OJJMTQWPAR+DcP4HpLbpFof+xj8fnqfDqolwu8CeSkFELPHA= 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 1692110362385554.817241294971; Tue, 15 Aug 2023 07:39:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVvBv-0008Nr-0R; Tue, 15 Aug 2023 10:38:39 -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 1qVvBt-0008Lu-R3 for qemu-devel@nongnu.org; Tue, 15 Aug 2023 10:38:37 -0400 Received: from smtp-out2.suse.de ([2001:67c:2178:6::1d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qVvBr-0002uI-1X for qemu-devel@nongnu.org; Tue, 15 Aug 2023 10:38:37 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id B24071F8C1; Tue, 15 Aug 2023 14:38:33 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 697F113909; Tue, 15 Aug 2023 14:38:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id KK/uDOiN22T0WQAAMHmgww (envelope-from ); Tue, 15 Aug 2023 14:38:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1692110313; 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=YWnFxOqJ5bfCNylnJ+ZhPlU1d0lBVmUHReGGAQQY0uk=; b=EXfq458kxzGY3vsVP+y2Ru+uRT9FXw/EI7MLSxHTjuSde8eI72J9v8vdVKrEbIUplpjBSl KJawWlMOBmv7/TJvGrmt+wGr+LLIGVKPacopLt90Ujs4cu26WhW13srK/H0gk36WdgVDqs Jt7moaHsvvZokummPe470h1YdL5EMEM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1692110313; 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=YWnFxOqJ5bfCNylnJ+ZhPlU1d0lBVmUHReGGAQQY0uk=; b=pkZsDX67WWqwDAaHBMnAOYMuYRu5RM+Md8sGDlbkOvX7+bOzvCsMtHr35cv0ExPmCF7umJ RfO7NOza1/8L2vBA== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Juan Quintela , Peter Xu , Leonardo Bras Subject: [PATCH 1/5] migration/ram: Remove RAMState from xbzrle_cache_zero_page Date: Tue, 15 Aug 2023 11:38:24 -0300 Message-Id: <20230815143828.15436-2-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230815143828.15436-1-farosas@suse.de> References: <20230815143828.15436-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2001:67c:2178:6::1d; 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, 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: 1692110484232100001 Content-Type: text/plain; charset="utf-8" 'rs' is not used in that function. It's a leftover from commit 9360447d34 ("ram: Use MigrationStats for statistics"). Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- migration/ram.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 9040d66e61..87efab72e8 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -561,7 +561,6 @@ void mig_throttle_counter_reset(void) /** * xbzrle_cache_zero_page: insert a zero page in the XBZRLE cache * - * @rs: current RAM state * @current_addr: address for the zero page * * Update the xbzrle cache to reflect a page that's been sent as all 0. @@ -570,7 +569,7 @@ void mig_throttle_counter_reset(void) * As a bonus, if the page wasn't in the cache it gets added so that * when a small write is made into the 0'd page it gets XBZRLE sent. */ -static void xbzrle_cache_zero_page(RAMState *rs, ram_addr_t current_addr) +static void xbzrle_cache_zero_page(ram_addr_t current_addr) { /* We don't care if this fails to allocate a new cache page * as long as it updated an old one */ @@ -2148,7 +2147,7 @@ static int ram_save_target_page_legacy(RAMState *rs, = PageSearchStatus *pss) */ if (rs->xbzrle_started) { XBZRLE_cache_lock(); - xbzrle_cache_zero_page(rs, block->offset + offset); + xbzrle_cache_zero_page(block->offset + offset); XBZRLE_cache_unlock(); } return res; --=20 2.35.3 From nobody Sun Feb 8 18:18:29 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1692110359; cv=none; d=zohomail.com; s=zohoarc; b=Vn4NEWj1rc+TkZ6+/ya0rRA//2D5psOnqTz0y7qJ1jfvqqdfARyLHDrSQz55yxudYyfhduGits90SxHSOer8mAjuTP97bc9PnioBzlpM6WtVa7fISflq7K4puLk5PgPzToAJCX9rCnom8cMfFCXK0VkAgEDKf6KAXhvEME+p7Fg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692110359; 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=Ss9HHRBxbtgwF7lE2GrcOoBMb9RS2y9xz29KikLYwck=; b=EOU0jtBFZt4ePdGGpZ3w9bE4A1YiB9E7zL4Q2869dzWHqHEzppaJeY8hUCCGnearaZ1sqkxitdZVkS1t9zH96g6DS1+Em0X8CcIbeUvUNBJUzNCKwCnqK70oLAvIXRg4fiwMMKtyf/HlY1kGcd09btPignSkhjvb+4cH94J5CGw= 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 1692110359586914.669267228395; Tue, 15 Aug 2023 07:39:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVvBw-0008Op-IO; Tue, 15 Aug 2023 10:38:40 -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 1qVvBv-0008OK-OT for qemu-devel@nongnu.org; Tue, 15 Aug 2023 10:38:39 -0400 Received: from smtp-out2.suse.de ([2001:67c:2178:6::1d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qVvBt-0002uZ-H4 for qemu-devel@nongnu.org; Tue, 15 Aug 2023 10:38:39 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 6EC551F8B8; Tue, 15 Aug 2023 14:38:35 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 27A7213909; Tue, 15 Aug 2023 14:38:33 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id uJqhOOmN22T0WQAAMHmgww (envelope-from ); Tue, 15 Aug 2023 14:38:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1692110315; 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=Ss9HHRBxbtgwF7lE2GrcOoBMb9RS2y9xz29KikLYwck=; b=yt1rD0sJqvAad8NouKnz8MTVCasH4BijgPK2a+UU6DiavO6WHmqOoa2E4HjNBh/8MIEBGa 8D+5AypM7zKd2iDAV6NaKNwfGEJrCXXRoUrSdVDM8shJf/f+UTfncP1LQZtlKaHMsrVjk8 0eJq9/0S9dYbmwYUK9ft9/CtsKVY8sU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1692110315; 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=Ss9HHRBxbtgwF7lE2GrcOoBMb9RS2y9xz29KikLYwck=; b=WjQCMuSZEMwPcw/rpeBlSzaMineXDtBAaqvtOzCGusuRU9kolv0UN3nBf0YbxtoESxIaP8 fWom/gbXzpnstPBg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Juan Quintela , Peter Xu , Leonardo Bras Subject: [PATCH 2/5] migration/ram: Stop passing QEMUFile around in save_zero_page Date: Tue, 15 Aug 2023 11:38:25 -0300 Message-Id: <20230815143828.15436-3-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230815143828.15436-1-farosas@suse.de> References: <20230815143828.15436-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2001:67c:2178:6::1d; 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, 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: 1692110360940100001 Content-Type: text/plain; charset="utf-8" We don't need the QEMUFile when we're already passing the PageSearchStatus. Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- migration/ram.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 87efab72e8..761f43dc34 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1138,10 +1138,11 @@ void ram_release_page(const char *rbname, uint64_t = offset) * @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page_to_file(PageSearchStatus *pss, QEMUFile *file, - RAMBlock *block, ram_addr_t offset) +static int save_zero_page_to_file(PageSearchStatus *pss, RAMBlock *block, + ram_addr_t offset) { uint8_t *p =3D block->host + offset; + QEMUFile *file =3D pss->pss_channel; int len =3D 0; =20 if (buffer_is_zero(p, TARGET_PAGE_SIZE)) { @@ -1162,10 +1163,10 @@ static int save_zero_page_to_file(PageSearchStatus = *pss, QEMUFile *file, * @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page(PageSearchStatus *pss, QEMUFile *f, RAMBlock *bl= ock, +static int save_zero_page(PageSearchStatus *pss, RAMBlock *block, ram_addr_t offset) { - int len =3D save_zero_page_to_file(pss, f, block, offset); + int len =3D save_zero_page_to_file(pss, block, offset); =20 if (len) { stat64_add(&mig_stats.zero_pages, 1); @@ -2140,7 +2141,7 @@ static int ram_save_target_page_legacy(RAMState *rs, = PageSearchStatus *pss) return 1; } =20 - res =3D save_zero_page(pss, pss->pss_channel, block, offset); + res =3D save_zero_page(pss, block, offset); if (res > 0) { /* Must let xbzrle know, otherwise a previous (now 0'd) cached * page would be stale --=20 2.35.3 From nobody Sun Feb 8 18:18:29 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1692110378; cv=none; d=zohomail.com; s=zohoarc; b=mKJCKpO70fuyUQ2iIXsR3ageXMfyDTYB0/Tu1eGwvZRva1yieRq0nBoCYMPnRg3ht3sh2HHI+aBdMM6Q1uG1fSHVvuOA7H4Ke4ciUQW4ZWSPo7Gm1unenZAcmxZ5SKA0GazENGvxUdZuwGlQp3y7LnUtzfW6DWVPGkGBCXFFc6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692110378; 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=3TGNvFSN3arnMJzpKDeKRoct5I/nrN/BDfvwsKDsORY=; b=RVvk0tAxr4lVAv2wMgrcvsrw/f4zUrD0I3TEiuGTI//qdkxuQKRio7y+Y5Y0HT6HMdGN9rhW15oy/1/VKSt0IQeUNfpt68dJqSJhZ/dNM0vOf5XP+F/WVG6cnz2Vk7Ec83qw7jb5SGkYkFeEPxabYKOt6pOC8m207mPkk0038qY= 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 1692110378001647.2392667775155; Tue, 15 Aug 2023 07:39:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVvBx-0008PI-Hd; Tue, 15 Aug 2023 10:38:41 -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 1qVvBw-0008Oq-Hx for qemu-devel@nongnu.org; Tue, 15 Aug 2023 10:38:40 -0400 Received: from smtp-out2.suse.de ([2001:67c:2178:6::1d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qVvBu-0002v3-Cm for qemu-devel@nongnu.org; Tue, 15 Aug 2023 10:38:40 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 33EBD1F8D5; Tue, 15 Aug 2023 14:38:37 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id D97BF13909; Tue, 15 Aug 2023 14:38:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id uGV4KOuN22T0WQAAMHmgww (envelope-from ); Tue, 15 Aug 2023 14:38:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1692110317; 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=3TGNvFSN3arnMJzpKDeKRoct5I/nrN/BDfvwsKDsORY=; b=BU390eNRulT+VcKd5qn7I3xMjn/gciQl+chswbjFLThI7nn9xD0K1ehlts/ZjSr+jfabrY nfV76cpxBCaU9QvFtOX7tThF7h4lDrnNXTqmYi8UpQfGZ5szl0BXJMDIQgnA6fg1FiXghG wy5Y5FTTNv8YOtv08tp9FOhJQYqwtKg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1692110317; 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=3TGNvFSN3arnMJzpKDeKRoct5I/nrN/BDfvwsKDsORY=; b=dDSdpkdF8N3pYTjL1AoE3TE2JByvFBWHQVzX+ke396obcWCAQKEjSZsdBNP7XQ6/k9sMU1 Hg7kXmLpo76d7oBQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Juan Quintela , Peter Xu , Leonardo Bras Subject: [PATCH 3/5] migration/ram: Move xbzrle zero page handling into save_zero_page Date: Tue, 15 Aug 2023 11:38:26 -0300 Message-Id: <20230815143828.15436-4-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230815143828.15436-1-farosas@suse.de> References: <20230815143828.15436-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2001:67c:2178:6::1d; 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, 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: 1692110500256100001 Content-Type: text/plain; charset="utf-8" It makes a bit more sense to have the zero page handling of xbzrle right where we save the zero page. This also makes save_zero_page() follow the same format as save_compress_page() at the top level of ram_save_target_page_legacy(). Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- migration/ram.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 761f43dc34..a10410a1a5 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1159,11 +1159,12 @@ static int save_zero_page_to_file(PageSearchStatus = *pss, RAMBlock *block, * * Returns the number of pages written. * + * @rs: current RAM state * @pss: current PSS channel * @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page(PageSearchStatus *pss, RAMBlock *block, +static int save_zero_page(RAMState *rs, PageSearchStatus *pss, RAMBlock *b= lock, ram_addr_t offset) { int len =3D save_zero_page_to_file(pss, block, offset); @@ -1171,6 +1172,17 @@ static int save_zero_page(PageSearchStatus *pss, RAM= Block *block, if (len) { stat64_add(&mig_stats.zero_pages, 1); ram_transferred_add(len); + + /* + * Must let xbzrle know, otherwise a previous (now 0'd) cached + * page would be stale. + */ + if (rs->xbzrle_started) { + XBZRLE_cache_lock(); + xbzrle_cache_zero_page(block->offset + offset); + XBZRLE_cache_unlock(); + } + return 1; } return -1; @@ -2141,17 +2153,8 @@ static int ram_save_target_page_legacy(RAMState *rs,= PageSearchStatus *pss) return 1; } =20 - res =3D save_zero_page(pss, block, offset); - if (res > 0) { - /* Must let xbzrle know, otherwise a previous (now 0'd) cached - * page would be stale - */ - if (rs->xbzrle_started) { - XBZRLE_cache_lock(); - xbzrle_cache_zero_page(block->offset + offset); - XBZRLE_cache_unlock(); - } - return res; + if (save_zero_page(rs, pss, block, offset)) { + return 1; } =20 /* --=20 2.35.3 From nobody Sun Feb 8 18:18:29 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1692110377; cv=none; d=zohomail.com; s=zohoarc; b=Vizd3X4TiY3r6bRoPpZVk/f38t1EdMnpqYw3s2Cm5o1sQfdc83PIP7peQol3+xN+4vtSfDZSpS0NtHgU+Zvoc6O6EsVTojCyeL01Oy1UyV79nsNHHh/cvwTEJ4bz2ppNexOma4PHPnFm/gS4I+bmM1uEr7eg9hPXv7TsJNSCbFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692110377; 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=toJxKUA5Dl8oTpfiH0/VZtwKHX39icaVQhUvfWCyR50=; b=fPA/PHdhxp5usBdHUqB2E596siRk2WS4mYqQ9wxWvYNsIn93CV02Yrh1v7x0jBhnRdZbU+Boe09UPwWs1o7e0+GuUk9QS4C80cnSLLi34PDF85s08ybQWzTSyGtJLdjkb/o1eh350kS53LL8w4SQ7UHlUF0qmpNs/jOfcta8FYk= 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 1692110377826288.2944814929367; Tue, 15 Aug 2023 07:39:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVvC0-0008Q3-4P; Tue, 15 Aug 2023 10:38:44 -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 1qVvBy-0008Pe-Ij for qemu-devel@nongnu.org; Tue, 15 Aug 2023 10:38:42 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qVvBw-0002vi-DR for qemu-devel@nongnu.org; Tue, 15 Aug 2023 10:38:42 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id E7E7721989; Tue, 15 Aug 2023 14:38:38 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9E65613909; Tue, 15 Aug 2023 14:38:37 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 0EEBGu2N22T0WQAAMHmgww (envelope-from ); Tue, 15 Aug 2023 14:38:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1692110318; 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=toJxKUA5Dl8oTpfiH0/VZtwKHX39icaVQhUvfWCyR50=; b=WGMMKKGg/NOfNHyp1kwVBPAUCEWIzsbmCwy9GK+DUQkfkJ0xUeSfywNqJimYU5AJeUlRWu yRwXrB9g2PzcDpUvs6yGeJFsioDErShWsChG6oXLwzXu+bsZx2eKyuhOcmu52pnv4/OhHw SxLEU853FJgkujUCpkSBk+O6gVK7wsw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1692110318; 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=toJxKUA5Dl8oTpfiH0/VZtwKHX39icaVQhUvfWCyR50=; b=O8qLObd0UEd2xASvtftrPLz1qHRHV3L7xqQGLveXeE5EwccbedSJhPl0CKEIlrXADqZ+Z7 LIlIUWmk7WZumECQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Juan Quintela , Peter Xu , Leonardo Bras Subject: [PATCH 4/5] migration/ram: Return early from save_zero_page Date: Tue, 15 Aug 2023 11:38:27 -0300 Message-Id: <20230815143828.15436-5-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230815143828.15436-1-farosas@suse.de> References: <20230815143828.15436-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.220.28; envelope-from=farosas@suse.de; helo=smtp-out1.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, 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: 1692110378401100001 Content-Type: text/plain; charset="utf-8" Invert the first conditional so we return early when len =3D=3D 0. This is merely to make the next patch easier to read. Signed-off-by: Fabiano Rosas --- migration/ram.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index a10410a1a5..8ec38f69e8 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1169,23 +1169,24 @@ static int save_zero_page(RAMState *rs, PageSearchS= tatus *pss, RAMBlock *block, { int len =3D save_zero_page_to_file(pss, block, offset); =20 - if (len) { - stat64_add(&mig_stats.zero_pages, 1); - ram_transferred_add(len); + if (!len) { + return -1; + } =20 - /* - * Must let xbzrle know, otherwise a previous (now 0'd) cached - * page would be stale. - */ - if (rs->xbzrle_started) { - XBZRLE_cache_lock(); - xbzrle_cache_zero_page(block->offset + offset); - XBZRLE_cache_unlock(); - } + stat64_add(&mig_stats.zero_pages, 1); + ram_transferred_add(len); =20 - return 1; + /* + * Must let xbzrle know, otherwise a previous (now 0'd) cached + * page would be stale. + */ + if (rs->xbzrle_started) { + XBZRLE_cache_lock(); + xbzrle_cache_zero_page(block->offset + offset); + XBZRLE_cache_unlock(); } - return -1; + + return 1; } =20 /* --=20 2.35.3 From nobody Sun Feb 8 18:18:29 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1692110386; cv=none; d=zohomail.com; s=zohoarc; b=LcGah2/mGjPKR3KqzvLX2AxkugPXuIn/bwhf+rog+yCJMVpJscZQSMCHqOqjXFkHaB0n4DIetwJFe3CjiMzz/WYrBwW6ns3xoXTzJHEcjr3z4HJXuiCRMqTixXlrp32Zs3uPzWnVmvtLbzescjl0ZbuRpK201S/JuwTpRCnqqns= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692110386; 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=rDHF1F1Gm9CKMTWMnNAi///z2f1xyUqQ3HKLwljCm00=; b=iQLKpRhOcCzsMAPnesNanB88VPO1dkzvJFxDQhvSNWIRaBQDZbWkGoQ4aLLgqVwiHc8TmPld0xNgmIuAJz25RTV2x8cuMcjBHYgY5mczcJ49lwl2/qMTIwlW9Tr4wTqzY7KdBIgDNm5bnSNQv7OYuHj8tKMLI7lfNFYxlAo046s= 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 1692110386040371.59468848437257; Tue, 15 Aug 2023 07:39:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVvC1-0008R7-Bi; Tue, 15 Aug 2023 10:38: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 1qVvC0-0008Pz-0O for qemu-devel@nongnu.org; Tue, 15 Aug 2023 10:38:44 -0400 Received: from smtp-out2.suse.de ([2001:67c:2178:6::1d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qVvBx-0002wO-Ns for qemu-devel@nongnu.org; Tue, 15 Aug 2023 10:38:43 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id A75701F749; Tue, 15 Aug 2023 14:38:40 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5DC6213909; Tue, 15 Aug 2023 14:38:39 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id UBc0Cu+N22T0WQAAMHmgww (envelope-from ); Tue, 15 Aug 2023 14:38:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1692110320; 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=rDHF1F1Gm9CKMTWMnNAi///z2f1xyUqQ3HKLwljCm00=; b=dqBEDlvdW1j9CeKbqHrCUe1Mx2Tc2eM8/RvqdXzPTw3IJ8kwN9uVh7a55NbmMXbLnfRrFQ fWBYMlT1vY83/yAPM6Phjtx8BCSV07TmyZnUHtPIphEGw/7M3DwdZ7c7D9WIfN9qYesGgq eRQ7MQdLxgCp2kTsqYopUIUCq0cjLyA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1692110320; 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=rDHF1F1Gm9CKMTWMnNAi///z2f1xyUqQ3HKLwljCm00=; b=5Y9cnO4dZyOM7VoBmhJn3T2ihxxpnuB/TxG4GS/zb9Ms1ofbWQRq6+5SmWV/FWqMBFHmFc Vd0PV/XWGXwMUZDg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Juan Quintela , Peter Xu , Leonardo Bras Subject: [PATCH 5/5] migration/ram: Merge save_zero_page functions Date: Tue, 15 Aug 2023 11:38:28 -0300 Message-Id: <20230815143828.15436-6-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230815143828.15436-1-farosas@suse.de> References: <20230815143828.15436-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2001:67c:2178:6::1d; 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, 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: 1692110387071100001 Content-Type: text/plain; charset="utf-8" We don't need to do this in two pieces. One single function makes it easier to grasp, specially since it removes the indirection on the return value handling. Signed-off-by: Fabiano Rosas --- migration/ram.c | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 8ec38f69e8..13935ead1c 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1128,32 +1128,6 @@ void ram_release_page(const char *rbname, uint64_t o= ffset) ram_discard_range(rbname, offset, TARGET_PAGE_SIZE); } =20 -/** - * save_zero_page_to_file: send the zero page to the file - * - * Returns the size of data written to the file, 0 means the page is not - * a zero page - * - * @pss: current PSS channel - * @block: block that contains the page we want to send - * @offset: offset inside the block for the page - */ -static int save_zero_page_to_file(PageSearchStatus *pss, RAMBlock *block, - ram_addr_t offset) -{ - uint8_t *p =3D block->host + offset; - QEMUFile *file =3D pss->pss_channel; - int len =3D 0; - - if (buffer_is_zero(p, TARGET_PAGE_SIZE)) { - len +=3D save_page_header(pss, file, block, offset | RAM_SAVE_FLAG= _ZERO); - qemu_put_byte(file, 0); - len +=3D 1; - ram_release_page(block->idstr, offset); - } - return len; -} - /** * save_zero_page: send the zero page to the stream * @@ -1167,12 +1141,19 @@ static int save_zero_page_to_file(PageSearchStatus = *pss, RAMBlock *block, static int save_zero_page(RAMState *rs, PageSearchStatus *pss, RAMBlock *b= lock, ram_addr_t offset) { - int len =3D save_zero_page_to_file(pss, block, offset); + uint8_t *p =3D block->host + offset; + QEMUFile *file =3D pss->pss_channel; + int len =3D 0; =20 - if (!len) { - return -1; + if (!buffer_is_zero(p, TARGET_PAGE_SIZE)) { + return 0; } =20 + len +=3D save_page_header(pss, file, block, offset | RAM_SAVE_FLAG_ZER= O); + qemu_put_byte(file, 0); + len +=3D 1; + ram_release_page(block->idstr, offset); + stat64_add(&mig_stats.zero_pages, 1); ram_transferred_add(len); =20 @@ -1186,7 +1167,7 @@ static int save_zero_page(RAMState *rs, PageSearchSta= tus *pss, RAMBlock *block, XBZRLE_cache_unlock(); } =20 - return 1; + return len; } =20 /* --=20 2.35.3