From nobody Fri Mar 27 04:54:24 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=D34XURl69hUr5lsDS0Wptj2Hs87/0z45eD4DbpVOmVmC7a7Qgz1mTkODEYcg7fb7ht3RWZLpBy8+abDGo5AsA3cUdv09sngzMcxVLMxaxVH3hcxelcQSOqMKzODoBZJw4PaXmb68+5thVSyVlJ9Yh9wii+s5rno95N+kN8QEjJ0= 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=AYhuDznNbNKEuGRtnHstzOlf8J/9DuMPGwXu4Ztobew=; b=GKzGcMAaqqroAAkntvGz3WcnBeh2A9BSvq7XmpH9wNz5r9hnzPHNckb+tJmvpjSCpeCdObiU5JU+gWdF5ifmZYBhc/jS+8dUEkZ46HEmEMfkhHOk+6xCaqmOuhpqQiefPK/R1mbhMFXq5eZY1IqbwK0I3EQ6eEiE+sz4YxZvIOo= 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 1772659623944169.185036247393; 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-0004q9-Rz; 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 1vxtgc-0004k6-NF 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 1vxtgZ-0003S2-NC for qemu-devel@nongnu.org; Wed, 04 Mar 2026 16:23:18 -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 8AFFF80866; Thu, 05 Mar 2026 00:23:12 +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-aWaeuria; Thu, 05 Mar 2026 00:23:12 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1772659392; bh=AYhuDznNbNKEuGRtnHstzOlf8J/9DuMPGwXu4Ztobew=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=HGNMhxMWXpLpTNQk6zd2nA7J037HFkZpGG7emzQqQzOokZ5G7XAltKMtvwXg/8rnS K2+unpZJFJy4qIRvKbfkh2XOWxEu9yKLGaXW3YN02LrOpvKSjwOZ7A4yyXdUTjv2tG Hi8uS4HBddolHLt3/82LZoyDkLnkE4RhCShhvXEY= 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 09/18] migration: factor out vmstate_load_field() from vmstate_load_state() Date: Thu, 5 Mar 2026 00:22:53 +0300 Message-ID: <20260304212303.667141-10-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: 1772659625569158500 Content-Type: text/plain; charset="utf-8" Simplify vmstate_load_state() which is rather big, and simplify further refactoring. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Peter Xu --- migration/vmstate.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/migration/vmstate.c b/migration/vmstate.c index 35dbe1550e9..32944c04443 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -161,6 +161,27 @@ static bool vmstate_pre_load(const VMStateDescription = *vmsd, void *opaque, return true; } =20 +static bool vmstate_load_field(QEMUFile *f, void *pv, size_t size, + const VMStateField *field, Error **errp) +{ + if (field->flags & VMS_STRUCT) { + return vmstate_load_state(f, field->vmsd, pv, field->vmsd->version= _id, + errp) >=3D 0; + } else if (field->flags & VMS_VSTRUCT) { + return vmstate_load_state(f, field->vmsd, pv, field->struct_versio= n_id, + errp) >=3D 0; + } + + if (field->info->get(f, pv, size, field) < 0) { + error_setg(errp, + "Failed to load element of type %s for %s", + field->info->name, field->name); + return false; + } + + return true; +} + int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, void *opaque, int version_id, Error **errp) { @@ -225,24 +246,8 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescr= iption *vmsd, inner_field =3D field; } =20 - if (inner_field->flags & VMS_STRUCT) { - ret =3D vmstate_load_state(f, inner_field->vmsd, curr_= elem, - inner_field->vmsd->version_id, - errp); - } else if (inner_field->flags & VMS_VSTRUCT) { - ret =3D vmstate_load_state(f, inner_field->vmsd, curr_= elem, - inner_field->struct_version_i= d, - errp); - } else { - ret =3D inner_field->info->get(f, curr_elem, size, - inner_field); - if (ret < 0) { - error_setg(errp, - "Failed to load element of type %s for = %s: " - "%d", inner_field->info->name, - inner_field->name, ret); - } - } + ret =3D vmstate_load_field(f, curr_elem, size, inner_field, + errp) ? 0 : -EINVAL; =20 /* If we used a fake temp field.. free it now */ if (inner_field !=3D field) { --=20 2.52.0