From nobody Sat Apr 11 23:07:58 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772611251; cv=none; d=zohomail.com; s=zohoarc; b=gNE5OM/072pFyh3IM6uFVEnnFnjeAZv+Y0eD78GKG0xp+dh264IV99kct12eXSX+Po7wUCIES1yHD/S3GQR3JXCaAO1GzVB4182OTtVeApREGmmOJ9LEoSQYkaVVQA+8ANWgKnJ/KTQQTu92KY3gxVSwdqp7UGpGR17mTo2jFI0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772611251; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=we2FB+ZMX82M1IcCOaZm4lzgrVAGYn4lhVZl4P65ADw=; b=m0W4bqmBpART0Uv/xcNT99Sf1ana7l+H7VmxQqIEtRrWgIrumQEqZe4wr7+o94HRzR/2xwv7rn1ynugvRn05CukRzLE8Sb74sEgEZGv9hqldvB21GYiJHSrXUc7IN5rd1m2km/YwpgFW69H41Ib5ta3dC4lQRIPtkBb34bmzZMw= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772611251081745.2915022265651; Wed, 4 Mar 2026 00:00:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxh9J-000568-NH; Wed, 04 Mar 2026 03:00:05 -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 1vxh9G-00051u-Ok for qemu-devel@nongnu.org; Wed, 04 Mar 2026 03:00:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vxh9E-00054M-VY for qemu-devel@nongnu.org; Wed, 04 Mar 2026 03:00:02 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-302-fNP8nwV1O8SLOXIkH6mysQ-1; Wed, 04 Mar 2026 02:59:57 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E21C719560A6 for ; Wed, 4 Mar 2026 07:59:56 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.140]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 83D691800759; Wed, 4 Mar 2026 07:59:56 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 107131800382; Wed, 04 Mar 2026 08:59:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772611199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=we2FB+ZMX82M1IcCOaZm4lzgrVAGYn4lhVZl4P65ADw=; b=fMHeoY8wvtXDTnUAFwRaMWiJwsejNzJN4O4elBNEtCUAWIpev4bcX0hI+ZJ2QOFQjlzqYu 8DxAFh7l78Q8fD3NgJypVOP5rR1fhm/dkzrTvWRjDbZeDYE5p1pSc8q6tpQhbFybRx2pyf V8oRz3xiwty8LMeh37gLAW1ps1uWn00= X-MC-Unique: fNP8nwV1O8SLOXIkH6mysQ-1 X-Mimecast-MFC-AGG-ID: fNP8nwV1O8SLOXIkH6mysQ_1772611197 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Subject: [PATCH] hw/uefi: add variable digest to vmstate Date: Wed, 4 Mar 2026 08:59:53 +0100 Message-ID: <20260304075954.584423-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 27 X-Spam_score: 2.7 X-Spam_bar: ++ X-Spam_report: (2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.322, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.141, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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 @redhat.com) X-ZM-MESSAGEID: 1772611253023158500 Content-Type: text/plain; charset="utf-8" Add digest to vmstate if needed. Clear digest before loading vmstate to make sure it is initialized. Fixes: db1ecfb473ac ("hw/uefi: add var-service-vars.c") Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/uefi/var-service-vars.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/hw/uefi/var-service-vars.c b/hw/uefi/var-service-vars.c index 94f40ef23684..22f91ab2d4b5 100644 --- a/hw/uefi/var-service-vars.c +++ b/hw/uefi/var-service-vars.c @@ -37,8 +37,40 @@ const VMStateDescription vmstate_uefi_time =3D { }, }; =20 +static int uefi_vars_pre_load(void *opaque) +{ + uefi_variable *var =3D opaque; + + /* clear digest which is optional in the live migration data stream */ + var->digest =3D NULL; + var->digest_size =3D 0; + return 0; +} + +static bool uefi_vars_digest_is_needed(void *opaque) +{ + uefi_variable *var =3D opaque; + + if ((var->attributes & EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACC= ESS) && + !uefi_vars_is_sb_any(var)) { + return true; + } + return false; +} + +const VMStateDescription vmstate_uefi_variable_digest =3D { + .name =3D "uefi-variable-digest", + .needed =3D uefi_vars_digest_is_needed, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32(digest_size, uefi_variable), + VMSTATE_VBUFFER_ALLOC_UINT32(digest, uefi_variable, 0, NULL, diges= t_size), + VMSTATE_END_OF_LIST() + }, +}; + const VMStateDescription vmstate_uefi_variable =3D { .name =3D "uefi-variable", + .pre_load =3D uefi_vars_pre_load, .fields =3D (VMStateField[]) { VMSTATE_UINT8_ARRAY_V(guid.data, uefi_variable, sizeof(QemuUUID), = 0), VMSTATE_UINT32(name_size, uefi_variable), @@ -49,6 +81,10 @@ const VMStateDescription vmstate_uefi_variable =3D { VMSTATE_STRUCT(time, uefi_variable, 0, vmstate_uefi_time, efi_time= ), VMSTATE_END_OF_LIST() }, + .subsections =3D (const VMStateDescription * const []) { + &vmstate_uefi_variable_digest, + NULL + } }; =20 uefi_variable *uefi_vars_find_variable(uefi_vars_state *uv, QemuUUID guid, --=20 2.53.0