From nobody Fri Mar 27 04:58:09 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=1772659623; cv=none; d=zohomail.com; s=zohoarc; b=amxV6WB2vqSN+h9DGoPZyBVRF8t5EwO2VNZQ9fb8GunTI+iDeshRXy1FQ3FlCp7UXx1rzan6f1g5rTgMBM3lx89rfsYClK0Kdop6b5bCBv2MV/VfS0sWGPJe5Mfzn5Xzbi6M49rtMNo0BcKSHch/7Ee5ALH0O96YE7uXRTOuQOk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772659623; 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=zfvpZuOeyFjNmdZf55BCFDQ1eY99UHXuHdSgW5RmBUs=; b=DSHn3FJKc6LBt4wOje2RZ1YgI6BolJpcFkWGiRr6s++eKWjf4sXFYM53nU8QY/CDOjaCYhkb74xHV6Jnqfbc/sDLdp/Wi8uBeZ0w6PCaz4gJY22KOz/eeKBK2g5x47MH9sqYQPeXuqXKXw4Vmo+ce/ltQV4A9+H554cSeBFjdAk= 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 1772659623673889.833623357982; Wed, 4 Mar 2026 13:27:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxth7-0004pF-Hp; Wed, 04 Mar 2026 16:23:49 -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 1vxtgb-0004k2-HY for qemu-devel@nongnu.org; Wed, 04 Mar 2026 16:23:20 -0500 Received: from forwardcorp1b.mail.yandex.net ([2a02:6b8:c02:900: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 1vxtgX-0003Ro-Ho for qemu-devel@nongnu.org; Wed, 04 Mar 2026 16:23:16 -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 forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 7D26180877; Thu, 05 Mar 2026 00:23:11 +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-ir54xSpN; Thu, 05 Mar 2026 00:23:11 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1772659391; bh=zfvpZuOeyFjNmdZf55BCFDQ1eY99UHXuHdSgW5RmBUs=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=0XZB2ljpgtmiGblBHuTwe+yVogNpxfMNaptPmLRK45osHPXHwzypx0b1dZtCMKOFD mEtPwAGZfrw8rfhVyz+zNs783dTAzTDWzCutWN2wBJKCMitFqnL76aLWFm2z27NYjX v51Z8OUJPA9Nn5YNgEp7jxQ3uEFpEzlTRji37f9I= 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 Subject: [PATCH v3 07/18] migration: factor out vmstate_save_field() from vmstate_save_state() Date: Thu, 5 Mar 2026 00:22:51 +0300 Message-ID: <20260304212303.667141-8-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:c02:900:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1b.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: 1772659626191139100 Content-Type: text/plain; charset="utf-8" Simplify vmstate_save_state() which is rather big, and simplify further refactoring. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Peter Xu --- migration/vmstate.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/migration/vmstate.c b/migration/vmstate.c index 605b5c59c76..2ce26527124 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -26,6 +26,9 @@ static int vmstate_subsection_save(QEMUFile *f, const VMS= tateDescription *vmsd, Error **errp); static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *= vmsd, void *opaque, Error **errp); +static int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vms= d, + void *opaque, JSONWriter *vmdesc, + int version_id, Error **errp); =20 /* Whether this field should exist for either save or load the VM? */ static bool @@ -455,6 +458,26 @@ static bool vmstate_pre_save(const VMStateDescription = *vmsd, void *opaque, return true; } =20 +static bool vmstate_save_field(QEMUFile *f, void *pv, size_t size, + const VMStateField *field, + JSONWriter *vmdesc, Error **errp) +{ + if (field->flags & VMS_STRUCT) { + return vmstate_save_state(f, field->vmsd, pv, vmdesc, errp) >=3D 0; + } else if (field->flags & VMS_VSTRUCT) { + return vmstate_save_state_v(f, field->vmsd, pv, vmdesc, + field->struct_version_id, + errp) >=3D 0; + } + + if (field->info->put(f, pv, size, field, vmdesc) < 0) { + error_setg(errp, "put failed"); + return false; + } + + return true; +} + static int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vms= d, void *opaque, JSONWriter *vmdesc, int version_id, Error **errp) @@ -548,21 +571,8 @@ static int vmstate_save_state_v(QEMUFile *f, const VMS= tateDescription *vmsd, vmsd_desc_field_start(vmsd, vmdesc_loop, inner_field, i, max_elems); =20 - if (inner_field->flags & VMS_STRUCT) { - ret =3D vmstate_save_state(f, inner_field->vmsd, - curr_elem, vmdesc_loop, errp); - } else if (inner_field->flags & VMS_VSTRUCT) { - ret =3D vmstate_save_state_v(f, inner_field->vmsd, - curr_elem, vmdesc_loop, - inner_field->struct_version= _id, - errp); - } else { - ret =3D inner_field->info->put(f, curr_elem, size, - inner_field, vmdesc_loop); - if (ret < 0) { - error_setg(errp, "put failed"); - } - } + ret =3D vmstate_save_field(f, curr_elem, size, inner_field, + vmdesc_loop, errp) ? 0 : -EINVAL; =20 written_bytes =3D qemu_file_transferred(f) - old_offset; vmsd_desc_field_end(vmsd, vmdesc_loop, inner_field, --=20 2.52.0