From nobody Fri Nov 14 21:05:52 2025 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=1761693484; cv=none; d=zohomail.com; s=zohoarc; b=XI8kX2VBYyt1kTHGiqhAyRksZLfdYanlReD+KmXm69HNu7jw8JHESBPbb0YeR9FVNosEKcCfuRHChR2IDuj+UKMh5BG6H0ZlUaR4Aec72eyn4aflBH3imodao3mig0pdLvijRy2D5DFMml7a837F2np2LQhjs6WDaZGAz8HDnQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761693484; 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=FJe9bBDqhj2CZOs8zGPWoZRXXGpH1eDzzeZX4vIEKoE=; b=nVohUXNRxnViVYoS/5JWFdHO2WXshMB7oa3OGZ/RwvidRr+/Y/NKoTiYsgSvQJDEA+1SpI7EsMQcqGFEx40CyHBMHFG1ob8VMwkk2V3SvJdTNpL7weHs19Sqc0S4+vtmkuAev/eN4KFfpwbwfPwv+7IggM+Y8S+02zC6P/3zTM8= 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 1761693484943205.6479324577217; Tue, 28 Oct 2025 16:18:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDstc-00031A-BC; Tue, 28 Oct 2025 19:14:33 -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 1vDstZ-0002zy-Jc for qemu-devel@nongnu.org; Tue, 28 Oct 2025 19:14:29 -0400 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 1vDstL-000182-RN for qemu-devel@nongnu.org; Tue, 28 Oct 2025 19:14:29 -0400 Received: from mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net [IPv6:2a02:6b8:c10:49f:0:640:b99a:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 4DCB781753; Wed, 29 Oct 2025 02:14:03 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:582::1:19]) by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id oDnXpg2bCW20-2KUF3LFw; Wed, 29 Oct 2025 02:14:02 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1761693243; bh=FJe9bBDqhj2CZOs8zGPWoZRXXGpH1eDzzeZX4vIEKoE=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=WvdEhIttMn2vNqBnoLrt3/vZmwkbiWezFgw26R+rw07XPNiIpgDeTEBoMUh/ExTos Kt+Mc32ACm+a2TotEx5pNTn9N/QOH4eD28kNKy9GT9JCENMRbzQkEWtCMih7ZObLuQ lecquitGHeyvx3wZ9Em3Z09iOYvKxMMj3exPmqlM= Authentication-Results: mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: peterx@redhat.com Cc: armbru@redhat.com, vsementsov@yandex-team.ru, qemu-devel@nongnu.org Subject: [RFC 16/22] hw/nvram/fw_cfg.c: use new migration APIs Date: Wed, 29 Oct 2025 02:13:40 +0300 Message-ID: <20251028231347.194844-17-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251028231347.194844-1-vsementsov@yandex-team.ru> References: <20251028231347.194844-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: 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: 1761693486366158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy --- hw/nvram/fw_cfg.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index aa24050493..d02e5802cd 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -565,27 +565,28 @@ static void fw_cfg_reset(DeviceState *d) Or we broke compatibility in the state, or we can't use struct tm */ =20 -static int get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size, - const VMStateField *field) +static bool get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size, + const VMStateField *field, Error **errp) { uint32_t *v =3D pv; *v =3D qemu_get_be16(f); - return 0; + return true; } =20 -static int put_unused(QEMUFile *f, void *pv, size_t size, - const VMStateField *field, JSONWriter *vmdesc) +static bool put_unused(QEMUFile *f, void *pv, size_t size, + const VMStateField *field, JSONWriter *vmdesc, + Error **errp) { - fprintf(stderr, "uint32_as_uint16 is only used for backward compatibil= ity.\n"); - fprintf(stderr, "This functions shouldn't be called.\n"); - - return 0; + error_setg(errp, + "uint32_as_uint16 is only used for backward compatibility. " + "This function shouldn't be called."); + return false; } =20 static const VMStateInfo vmstate_hack_uint32_as_uint16 =3D { .name =3D "int32_as_uint16", - .get =3D get_uint32_as_uint16, - .put =3D put_unused, + .load =3D get_uint32_as_uint16, + .save =3D put_unused, }; =20 #define VMSTATE_UINT16_HACK(_f, _s, _t) = \ @@ -631,7 +632,8 @@ static void fw_cfg_update_mr(FWCfgState *s, uint16_t ke= y, size_t size) memory_region_ram_resize(mr, size, &error_abort); } =20 -static int fw_cfg_acpi_mr_restore_post_load(void *opaque, int version_id) +static bool fw_cfg_acpi_mr_restore_post_load(void *opaque, int version_id, + Error **errp) { FWCfgState *s =3D opaque; int i, index; @@ -650,7 +652,7 @@ static int fw_cfg_acpi_mr_restore_post_load(void *opaqu= e, int version_id) } } =20 - return 0; + return true; } =20 static const VMStateDescription vmstate_fw_cfg_dma =3D { @@ -667,7 +669,7 @@ static const VMStateDescription vmstate_fw_cfg_acpi_mr = =3D { .version_id =3D 1, .minimum_version_id =3D 1, .needed =3D fw_cfg_acpi_mr_restore, - .post_load =3D fw_cfg_acpi_mr_restore_post_load, + .post_load_errp =3D fw_cfg_acpi_mr_restore_post_load, .fields =3D (const VMStateField[]) { VMSTATE_UINT64(table_mr_size, FWCfgState), VMSTATE_UINT64(linker_mr_size, FWCfgState), --=20 2.48.1