From nobody Fri Jan 9 09:11:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1766970711; cv=none; d=zohomail.com; s=zohoarc; b=J3s8ujZli/BCmISNIKJJ8fKYqkNyRwg3WHdueGbMPWt5uwlnoyT0kfLRaQjqva+lsLoZaoQV+o8FnfHpTl+gfmm0jUzAPCTBYoctDpL3ze3rVKuokrZSxRCQwjTAXrK9ebMdhF6FPtWI4t/jBZlUtKeynPHc4ei2g8O7gv5V6z4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766970711; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=7WAG+OcYJHK9u3jJ1HP7jMDt0r05io6FQa+N5rqH/Xc=; b=D4jKB2jPPvDk538xx37DWu+07hXOjQ8wHxY+NB2mC88ym/TvMEgnlEHUdFInB4ufh++ZVQiwaLrslg2FC5v3T4hqk6jtWNZZfJwZZ4YmZBaeEpjP9t97/PjN/D9Nu3FsH9NW3JI5UkmDKyOpE9xVPOfLhvQWmBDMikiV6TinjKA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1766970711544497.0605813188919; Sun, 28 Dec 2025 17:11:51 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 208BB3F364; Sun, 28 Dec 2025 20:11:48 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 8DC1E3F81D; Sun, 28 Dec 2025 20:09:55 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id B498D418E1; Sun, 28 Dec 2025 18:49:54 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C0515417F4 for ; Sun, 28 Dec 2025 18:41:27 -0500 (EST) 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-47-hWgmzcN7MtKbbZIlIvnmgw-1; Sun, 28 Dec 2025 18:41:26 -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 4FB3F19560BB for ; Sun, 28 Dec 2025 23:41:25 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.19]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 91AE9180035A for ; Sun, 28 Dec 2025 23:41:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766965287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7WAG+OcYJHK9u3jJ1HP7jMDt0r05io6FQa+N5rqH/Xc=; b=eOXDjgxdinXFCw4AmmOf18SfR7LpCbd7DtNje/5jLUGPf5LyrkMlzQHKUmXXgLYx7H2VMb u8WVo/1xomMP8d918sEhU9Pc9KRskyvBhKUW257G96L7yeGQU0h6wXNq97RENnLw7ZojFc Y9A74vMvOV4LWkkbCcXh94mf9aiI1bg= X-MC-Unique: hWgmzcN7MtKbbZIlIvnmgw-1 X-Mimecast-MFC-AGG-ID: hWgmzcN7MtKbbZIlIvnmgw_1766965285 To: devel@lists.libvirt.org Subject: [PATCH 28/29] qemu_command: Use uefi-vars device where appropriate Date: Mon, 29 Dec 2025 00:40:47 +0100 Message-ID: <20251228234048.1711701-29-abologna@redhat.com> In-Reply-To: <20251228234048.1711701-1-abologna@redhat.com> References: <20251228234048.1711701-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: usWnrtgxi9A_UvDfFeaKrvcbUKdvSxZU51aEiDYRXJk_1766965285 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 7KNSEYEIIMBNFABRQZPKDG2IWOSR7G23 X-Message-ID-Hash: 7KNSEYEIIMBNFABRQZPKDG2IWOSR7G23 X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Andrea Bolognani via Devel Reply-To: Andrea Bolognani X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1766970712978158500 Content-Type: text/plain; charset="utf-8"; x-default="true" This makes guests actually functional. https://issues.redhat.com/browse/RHEL-82645 Signed-off-by: Andrea Bolognani --- src/qemu/qemu_command.c | 36 +++++++++++++++++++ ...-enrolled-keys-aarch64.aarch64-latest.args | 1 + ...o-efi-format-nvram-json.x86_64-latest.args | 1 + ...l-efi-qemuvars-aarch64.aarch64-latest.args | 1 + ...manual-efi-qemuvars-q35.x86_64-latest.args | 1 + 5 files changed, 40 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 98229d7cf9..2e98710548 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9731,6 +9731,39 @@ qemuBuildDomainLoaderCommandLine(virCommand *cmd, } =20 =20 +static int +qemuBuildUefiVarsCommandLine(virCommand *cmd, + const virDomainDef *def, + virQEMUCaps *qemuCaps) +{ + virDomainLoaderDef *loader =3D def->os.loader; + g_autoptr(virJSONValue) props =3D NULL; + const char *model =3D NULL; + + if (!loader || !loader->nvram) + return 0; + + if (loader->nvram->format !=3D VIR_STORAGE_FILE_JSON) + return 0; + + if (ARCH_IS_X86(def->os.arch)) + model =3D "uefi-vars-x64"; + else + model =3D "uefi-vars-sysbus"; + + if (virJSONValueObjectAdd(&props, + "s:driver", model, + "s:jsonfile", loader->nvram->path, + NULL) < 0) + return -1; + + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCaps) < 0) + return -1; + + return 0; +} + + static int qemuBuildTPMDevCmd(virCommand *cmd, const virDomainDef *def, @@ -10805,6 +10838,9 @@ qemuBuildCommandLine(virDomainObj *vm, =20 qemuBuildDomainLoaderCommandLine(cmd, def); =20 + if (qemuBuildUefiVarsCommandLine(cmd, def, qemuCaps) < 0) + return NULL; + if (qemuBuildMemCommandLine(cmd, def, qemuCaps, priv) < 0) return NULL; =20 diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-aarch64.= aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys= -aarch64.aarch64-latest.args index d12949dbf2..de5745ddd4 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-aarch64.aarch64= -latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-aarch64.aarch64= -latest.args @@ -13,6 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt-4.0,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,acpi=3Don \ -accel kvm \ -bios /usr/share/edk2/aarch64/QEMU_EFI.qemuvars.fd \ +-device '{"driver":"uefi-vars-sysbus","jsonfile":"/var/lib/libvirt/qemu/nv= ram/guest.json"}' \ -m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-json.x86_= 64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-json.= x86_64-latest.args index 9a899c2a65..1ff6a45599 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-json.x86_64-late= st.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-json.x86_64-late= st.args @@ -14,6 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel kvm \ -cpu qemu64 \ -bios /usr/share/edk2/ovmf/OVMF.qemuvars.fd \ +-device '{"driver":"uefi-vars-x64","jsonfile":"/var/lib/libvirt/qemu/nvram= /guest.json"}' \ -m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-qemuvars-aarch64.aar= ch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-qemuvars-aarch= 64.aarch64-latest.args index 575ffdb42b..8c780f7f78 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-qemuvars-aarch64.aarch64-la= test.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-qemuvars-aarch64.aarch64-la= test.args @@ -14,6 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel tcg \ -cpu cortex-a15 \ -bios /usr/share/edk2/aarch64/QEMU_EFI.qemuvars.fd \ +-device '{"driver":"uefi-vars-sysbus","jsonfile":"/path/to/guest.json"}' \ -m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-qemuvars-q35.x86_64-= latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-qemuvars-q35.x86_64= -latest.args index ffc3d3c86d..10eab01ef8 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-qemuvars-q35.x86_64-latest.= args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-qemuvars-q35.x86_64-latest.= args @@ -14,6 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel tcg \ -cpu qemu64 \ -bios /usr/share/edk2/ovmf/OVMF.qemuvars.fd \ +-device '{"driver":"uefi-vars-x64","jsonfile":"/path/to/guest.json"}' \ -m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ --=20 2.52.0