From nobody Sun Apr 12 05:59:17 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=1771344985; cv=none; d=zohomail.com; s=zohoarc; b=E2yCZ6gHoc7HXSIr6fuOSwmOeF9XwAg64OGKfMocOJnpZNqRH5nobmVVqLd7SLi8rSeJixeDIh2M8NVfITkQla7Ip7/uiAXpnei7v9bbesx+OMuWhYQ5J5LsFpQkqJKFAn3N59lX+hjAJ4Kcnq2JQN88Rh7vZ4KkhJuXPAQ1W+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771344985; 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=tK4/ttAO/SNXZmJLNh5rwp3VCdcNm1uinpaCsgNSp1M=; b=jcfyQz4PEE/UXlzDEscmKOEagMtmtLoMTNXqw6KdB7KTv3C0Tk+8bURbb9m3O6wWr8uW2oSV+n6AxlcbpdMwq+k9as6taI/uHhXSrrF0Z7/bAHv5HGOpsCpFaGAYDEbq/0KEYQSpa35QlU7Ib5hvyareoEJaHcGJwnTbSAIyicE= 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 1771344985510534.6365868622672; Tue, 17 Feb 2026 08:16:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsNkF-0003Jn-SE; Tue, 17 Feb 2026 11:16:15 -0500 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 1vsNkE-0003C3-AJ for qemu-devel@nongnu.org; Tue, 17 Feb 2026 11:16:14 -0500 Received: from smtp-out2.suse.de ([2a07:de40:b251:101:10:150:64:2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vsNkC-0003F0-Cr for qemu-devel@nongnu.org; Tue, 17 Feb 2026 11:16:14 -0500 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 06D355BD20; Tue, 17 Feb 2026 16:15:27 +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 C36F53EA66; Tue, 17 Feb 2026 16:15:25 +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 SEbNIR2UlGmHTgAAD6G6ig (envelope-from ); Tue, 17 Feb 2026 16:15:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1771344927; 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=tK4/ttAO/SNXZmJLNh5rwp3VCdcNm1uinpaCsgNSp1M=; b=JyCIBlvmOFNjDkOIF2I6UI3it+Q20HnET5vec0svinR2SKiLiCqFHAoT1zj/uaAVgOz1cu IgXl3NJnJHM3Pc2fb4aW9A2/D1Nq5QWIsElsd++XBuezsXAqcJMamek7/GCtqIHZDQI0Xe gUK4AfMEGdaz+xQMXLbcweHPibdMGxw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1771344927; 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=tK4/ttAO/SNXZmJLNh5rwp3VCdcNm1uinpaCsgNSp1M=; b=d50Tdt3Voby7qBiz12UY9lcF/5wr4AVh65rMfPunFmKRPnR80qaTWJHWtOXXch5WycY/5O pv/OwdU50gBchMDg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=JyCIBlvm; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=d50Tdt3V DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1771344927; 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=tK4/ttAO/SNXZmJLNh5rwp3VCdcNm1uinpaCsgNSp1M=; b=JyCIBlvmOFNjDkOIF2I6UI3it+Q20HnET5vec0svinR2SKiLiCqFHAoT1zj/uaAVgOz1cu IgXl3NJnJHM3Pc2fb4aW9A2/D1Nq5QWIsElsd++XBuezsXAqcJMamek7/GCtqIHZDQI0Xe gUK4AfMEGdaz+xQMXLbcweHPibdMGxw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1771344927; 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=tK4/ttAO/SNXZmJLNh5rwp3VCdcNm1uinpaCsgNSp1M=; b=d50Tdt3Voby7qBiz12UY9lcF/5wr4AVh65rMfPunFmKRPnR80qaTWJHWtOXXch5WycY/5O pv/OwdU50gBchMDg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Lukas Straub Subject: [PULL 23/32] migration: qemu_savevm_state_complete_precopy() take MigrationState* Date: Tue, 17 Feb 2026 13:14:34 -0300 Message-ID: <20260217161443.12738-24-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260217161443.12738-1-farosas@suse.de> References: <20260217161443.12738-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; 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)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; URIBL_BLOCKED(0.00)[suse.de:mid,suse.de:dkim,suse.de:email,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; FREEMAIL_CC(0.00)[redhat.com,web.de]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:mid,suse.de:dkim,suse.de:email]; R_RATELIMIT(0.00)[to_ip_from(RLi3368pnyb3ujpcs6u1hud8b3)]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCPT_COUNT_THREE(0.00)[3]; FREEMAIL_ENVRCPT(0.00)[web.de] X-Rspamd-Action: no action X-Spam-Score: -3.01 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: 06D355BD20 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:2; envelope-from=farosas@suse.de; helo=smtp-out2.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: qemu development 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: 1771344987731158500 Content-Type: text/plain; charset="utf-8" From: Peter Xu Make it pass in MigrationState* instead of s->to_dst_file, so as to drop the internal migrate_get_current(). Signed-off-by: Peter Xu Reviewed-by: Fabiano Rosas Tested-by: Lukas Straub Link: https://lore.kernel.org/qemu-devel/20260127185254.3954634-18-peterx@r= edhat.com Signed-off-by: Fabiano Rosas --- migration/migration.c | 2 +- migration/savevm.c | 7 ++++--- migration/savevm.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index b1d421953f..27e4456429 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2757,7 +2757,7 @@ static int migration_completion_precopy(MigrationStat= e *s) goto out_unlock; } =20 - ret =3D qemu_savevm_state_complete_precopy(s->to_dst_file); + ret =3D qemu_savevm_state_complete_precopy(s); out_unlock: bql_unlock(); return ret; diff --git a/migration/savevm.c b/migration/savevm.c index e1918d4f38..830d8e5988 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1728,8 +1728,9 @@ int qemu_savevm_state_non_iterable(QEMUFile *f) return 0; } =20 -int qemu_savevm_state_complete_precopy(QEMUFile *f) +int qemu_savevm_state_complete_precopy(MigrationState *s) { + QEMUFile *f =3D s->to_dst_file; int ret; =20 ret =3D qemu_savevm_state_complete_precopy_iterable(f, false); @@ -1742,7 +1743,7 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f) return ret; } =20 - qemu_savevm_state_end_precopy(migrate_get_current(), f); + qemu_savevm_state_end_precopy(s, f); =20 return qemu_fflush(f); } @@ -1841,7 +1842,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **err= p) =20 ret =3D qemu_file_get_error(f); if (ret =3D=3D 0) { - qemu_savevm_state_complete_precopy(f); + qemu_savevm_state_complete_precopy(ms); ret =3D qemu_file_get_error(f); } if (ret !=3D 0) { diff --git a/migration/savevm.h b/migration/savevm.h index 57b96133d5..bded5e2a6c 100644 --- a/migration/savevm.h +++ b/migration/savevm.h @@ -42,7 +42,7 @@ void qemu_savevm_state_header(QEMUFile *f); int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy); void qemu_savevm_state_cleanup(void); void qemu_savevm_state_complete_postcopy(QEMUFile *f); -int qemu_savevm_state_complete_precopy(QEMUFile *f); +int qemu_savevm_state_complete_precopy(MigrationState *s); void qemu_savevm_state_pending_exact(uint64_t *must_precopy, uint64_t *can_postcopy); void qemu_savevm_state_pending_estimate(uint64_t *must_precopy, --=20 2.51.0