From nobody Tue Mar 3 04:54:09 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; 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=1771873475; cv=none; d=zohomail.com; s=zohoarc; b=UGihwfNZlwhjdTzs6IaU4g/scZHYPTsxlOW04IPZ+WhHjSMRadYO+yD6edsFoexo/oQ6KtuxXZctegS94hVMERXGug4i6P9UW3RxVW29P8rxnUjQbFcQUOTzcpRObG0rVTlOXxOwaScA62dt0pKHWFRE1y9DmXsznxi94NI1dlQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771873475; 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=O44+SD5xtRzWtPbNOQUbC8aWHZDpqMN8+jozhPfXl9o=; b=IcZZf3kNHlkaf9RD1WplCPesu61g899ElI8O4uQSvXjT1dA033zcrfu0KQWJalpWQugEqy6NbQOVQ2GnVCTcyd3PzB2LQ/u5WjxvS+0sloF8b6aAPtOzPIJwDNkJIupavdnFX3j1ct79YhKcysNGgNfe2sK8K47PNCsi7ZRDK1o= 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 1771873475142213.48785677866124; Mon, 23 Feb 2026 11:04:35 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 70AD141CC3; Mon, 23 Feb 2026 14:04:35 -0500 (EST) Received: from [172.19.199.9] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id D31FD4449A; Mon, 23 Feb 2026 13:37:05 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id B11E041C74; Mon, 23 Feb 2026 13:36:49 -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 AA2CE41C74 for ; Mon, 23 Feb 2026 13:32:28 -0500 (EST) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-623-FiJd-SVZOVq2TSjqv_G6Iw-1; Mon, 23 Feb 2026 13:32:26 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A30671800267 for ; Mon, 23 Feb 2026 18:32:25 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.44.32.20]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 857191955D71 for ; Mon, 23 Feb 2026 18:32: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=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,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=1771871548; 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=O44+SD5xtRzWtPbNOQUbC8aWHZDpqMN8+jozhPfXl9o=; b=UDZt9A02Yx6u++nNLVDB7QJwM2ls2g4Sv/s4XsT7kgm4iNJDhPxvIEMq2lVDnxwXbNt+3J qvBJPR9W20GzQqI7njT/TQmZmzV1RhxY5l5lKOCPvsNth1HvpkJhshpYDqGgg/qAE2n3SP EMXOu0IqIIaQDRJlt2i+tqRyrhVyA1o= X-MC-Unique: FiJd-SVZOVq2TSjqv_G6Iw-1 X-Mimecast-MFC-AGG-ID: FiJd-SVZOVq2TSjqv_G6Iw_1771871545 To: devel@lists.libvirt.org Subject: [PATCH v4 33/36] qemu_command: Use uefi-vars device where appropriate Date: Mon, 23 Feb 2026 19:31:16 +0100 Message-ID: <20260223183119.501349-34-abologna@redhat.com> In-Reply-To: <20260223183119.501349-1-abologna@redhat.com> References: <20260223183119.501349-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: WpA940f6nHxfNqqlsUn90UEDk6EW-rltR2sQ2lbePE4_1771871545 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: NF4C7X2ER5IXRYGNPT5YARBD3CG2UIHK X-Message-ID-Hash: NF4C7X2ER5IXRYGNPT5YARBD3CG2UIHK 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: 1771873490546158500 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 Reviewed-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_command.c | 34 +++++++++++++++++++ ...-enrolled-keys-aarch64.aarch64-latest.args | 1 + ...o-efi-varstore-aarch64.aarch64-latest.args | 1 + ...e-auto-efi-varstore-q35.x86_64-latest.args | 1 + ...l-efi-varstore-aarch64.aarch64-latest.args | 1 + ...manual-efi-varstore-q35.x86_64-latest.args | 1 + 6 files changed, 39 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a742998e4c..ba300f3551 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9815,6 +9815,37 @@ qemuBuildDomainLoaderCommandLine(virCommand *cmd, } =20 =20 +static int +qemuBuildUefiVarsCommandLine(virCommand *cmd, + const virDomainDef *def, + virQEMUCaps *qemuCaps) +{ + virDomainLoaderDef *loader =3D def->os.loader; + virDomainVarstoreDef *varstore =3D def->os.varstore; + g_autoptr(virJSONValue) props =3D NULL; + const char *model =3D NULL; + + if (!loader || !varstore || !varstore->path) + 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", varstore->path, + NULL) < 0) + return -1; + + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCaps) < 0) + return -1; + + return 0; +} + + static int qemuBuildTPMDevCmd(virCommand *cmd, const virDomainDef *def, @@ -10889,6 +10920,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 abc934692a..10f1a5a6a4 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-8.2,usb=3Doff,gic-version=3D2,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/va= rstore/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-varstore-aarch64.aarch= 64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-varstore-aarch64.a= arch64-latest.args index abc934692a..10f1a5a6a4 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-varstore-aarch64.aarch64-late= st.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-varstore-aarch64.aarch64-late= st.args @@ -13,6 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt-8.2,usb=3Doff,gic-version=3D2,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/va= rstore/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-varstore-q35.x86_64-la= test.args b/tests/qemuxmlconfdata/firmware-auto-efi-varstore-q35.x86_64-lat= est.args index 9a899c2a65..392ea77c28 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-varstore-q35.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/firmware-auto-efi-varstore-q35.x86_64-latest.ar= gs @@ -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/varst= ore/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-varstore-aarch64.aar= ch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-varstore-aarch= 64.aarch64-latest.args index abc934692a..894bab7ffe 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-varstore-aarch64.aarch64-la= test.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-varstore-aarch64.aarch64-la= test.args @@ -13,6 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt-8.2,usb=3Doff,gic-version=3D2,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":"/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-varstore-q35.x86_64-= latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-varstore-q35.x86_64= -latest.args index 9a899c2a65..6c04c8c39f 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-varstore-q35.x86_64-latest.= args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-varstore-q35.x86_64-latest.= 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":"/path/to/guest.json"}' \ -m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ --=20 2.53.0