From nobody Fri Mar 27 05:08:26 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=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1772659482; cv=none; d=zohomail.com; s=zohoarc; b=Qq3i0+iO9YPU/G8hp52yFnqJao2X7NwExs2b9YHF8f/ZmyvIDmEU8M/Q3uAsacxgRoBfIlU9+JGTBJN9WHSC0AiWmLI6SU36XJpxIcmLJMK0a0PbixePEI1nBBCu7u+oM1b6iNHouf4PPG0LOf3vJv8IrbyeUPuk23W+koVFtKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772659482; 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=B73nPWJcUAv3T4zGXNwZqG1+gDtERH9N2aYgr3lGjlQ=; b=XNQMdmRDoulh0k0R1MzlIa6oQ30p/nlBD9WXjOaPsPdFzOZRgw388wnAx4jFojF766pgFKH0UeZ7RjRiv+y4Ej6rfyf9Xbt412Jn5DApySeDt87xsbxiRLwIYrsXs2kyumR8kYvZeuZekvWazIYDnuYAuDLueayhcmrY2dZk5AM= 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 1772659482176842.4933298373875; Wed, 4 Mar 2026 13:24:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxtgy-0004o5-DB; Wed, 04 Mar 2026 16:23:40 -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 1vxtgf-0004lz-1c for qemu-devel@nongnu.org; Wed, 04 Mar 2026 16:23:24 -0500 Received: from forwardcorp1d.mail.yandex.net ([2a02:6b8:c41:1300:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vxtgc-0003TB-Gt for qemu-devel@nongnu.org; Wed, 04 Mar 2026 16:23:20 -0500 Received: from mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:bf1f:0:640:c739:0]) by forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id ED04680BCD; Thu, 05 Mar 2026 00:23:15 +0300 (MSK) Received: from vsementsov-lin (unknown [2a02:6bf:8080:921::1:1b]) by mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id 5NwBA90AmW20-NtvCHoHd; Thu, 05 Mar 2026 00:23:15 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1772659395; bh=B73nPWJcUAv3T4zGXNwZqG1+gDtERH9N2aYgr3lGjlQ=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=eE3YxCj8iT+MdPZOvPGtAv9i+m3EZnjaH34/4ekqWHOC8w9IxpjLbpx1t1FFk0Ft0 lvnE5wyi/ZrvCq2vkSv9DM8V+erpXTLP9yCYOlPm7GEQOiUf/1sfV9KbUVmgAz5eW4 hsggm1dyEqJE/3qlcJnZoH5pJ1wpDB3LeQoMnwkw= Authentication-Results: mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: peterx@redhat.com Cc: farosas@suse.de, vsementsov@yandex-team.ru, qemu-devel@nongnu.org, Mark Kanda , Ben Chaney Subject: [PATCH v3 14/18] migration/cpr: move to new migration APIs Date: Thu, 5 Mar 2026 00:22:58 +0300 Message-ID: <20260304212303.667141-15-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260304212303.667141-1-vsementsov@yandex-team.ru> References: <20260304212303.667141-1-vsementsov@yandex-team.ru> 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=2a02:6b8:c41:1300:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1d.mail.yandex.net 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 @yandex-team.ru) X-ZM-MESSAGEID: 1772659488057158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Peter Xu --- include/migration/cpr.h | 2 +- migration/cpr.c | 22 +++++++++------------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/include/migration/cpr.h b/include/migration/cpr.h index 5850fd1788b..96ce26e7117 100644 --- a/include/migration/cpr.h +++ b/include/migration/cpr.h @@ -43,7 +43,7 @@ void cpr_set_incoming_mode(MigMode mode); bool cpr_is_incoming(void); =20 bool cpr_state_save(MigrationChannel *channel, Error **errp); -int cpr_state_load(MigrationChannel *channel, Error **errp); +bool cpr_state_load(MigrationChannel *channel, Error **errp); void cpr_state_close(void); struct QIOChannel *cpr_state_ioc(void); =20 diff --git a/migration/cpr.c b/migration/cpr.c index a0b37007f55..05266dfcfd3 100644 --- a/migration/cpr.c +++ b/migration/cpr.c @@ -178,7 +178,6 @@ bool cpr_is_incoming(void) =20 bool cpr_state_save(MigrationChannel *channel, Error **errp) { - int ret; QEMUFile *f; MigMode mode =3D migrate_mode(); =20 @@ -199,8 +198,7 @@ bool cpr_state_save(MigrationChannel *channel, Error **= errp) qemu_put_be32(f, QEMU_CPR_FILE_MAGIC); qemu_put_be32(f, QEMU_CPR_FILE_VERSION); =20 - ret =3D vmstate_save_state(f, &vmstate_cpr_state, &cpr_state, 0, errp); - if (ret) { + if (!vmstate_save_vmsd(f, &vmstate_cpr_state, &cpr_state, 0, errp)) { qemu_fclose(f); return false; } @@ -223,9 +221,8 @@ bool cpr_state_save(MigrationChannel *channel, Error **= errp) return true; } =20 -int cpr_state_load(MigrationChannel *channel, Error **errp) +bool cpr_state_load(MigrationChannel *channel, Error **errp) { - int ret; uint32_t v; QEMUFile *f; MigMode mode =3D 0; @@ -241,10 +238,10 @@ int cpr_state_load(MigrationChannel *channel, Error *= *errp) cpr_set_incoming_mode(mode); f =3D cpr_transfer_input(channel, errp); } else { - return 0; + return true; } if (!f) { - return -1; + return false; } =20 trace_cpr_state_load(MigMode_str(mode)); @@ -254,19 +251,18 @@ int cpr_state_load(MigrationChannel *channel, Error *= *errp) if (v !=3D QEMU_CPR_FILE_MAGIC) { error_setg(errp, "Not a migration stream (bad magic %x)", v); qemu_fclose(f); - return -EINVAL; + return false; } v =3D qemu_get_be32(f); if (v !=3D QEMU_CPR_FILE_VERSION) { error_setg(errp, "Unsupported migration stream version %d", v); qemu_fclose(f); - return -ENOTSUP; + return false; } =20 - ret =3D vmstate_load_state(f, &vmstate_cpr_state, &cpr_state, 1, errp); - if (ret) { + if (!vmstate_load_vmsd(f, &vmstate_cpr_state, &cpr_state, 1, errp)) { qemu_fclose(f); - return ret; + return false; } =20 if (migrate_mode() =3D=3D MIG_MODE_CPR_EXEC) { @@ -280,7 +276,7 @@ int cpr_state_load(MigrationChannel *channel, Error **e= rrp) */ cpr_state_file =3D f; =20 - return ret; + return true; } =20 void cpr_state_close(void) --=20 2.52.0