From nobody Sun Feb 8 17:21:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658507017; cv=none; d=zohomail.com; s=zohoarc; b=Lz4o3kvDTuH2shion1fbEf2dLvdRpIXbJWjxmxCefnhCGA6OH0Ay1l5eJTpf0nqNzfI3vmxyosm9ZnKVOoGfbFUrdyzIscvqvff2RIQV+a/T9mZQZtf9aIwYi1Qs+sltlj54m6tHqnUcSlU32yWjCKKYxzYuF7ZAT2eeln+3OH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658507017; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iEW8YoSAOelDltoOkUvqF6iF+QiPWQCwuubUFQJgGlk=; b=nHzmL8td7HKi6yisNz1saDnpRI97APPBWLvS2b4rGQ7EonAJui4GA9gneeSFD79Rzo/MumSsZ18beT4h4CdwofYzBWtHp7306lp1M3i1aodGRQzQypU5HZZOeP86MoB4+Vlpcs+X9Sgnbz+f86xbZuQhdwHMdtOIsvi19zksEsc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1658507017694428.39025513235185; Fri, 22 Jul 2022 09:23:37 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-308-IAvZ5YmrNZyKh9uVV7Gi9A-1; Fri, 22 Jul 2022 12:23:23 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DF679823F72; Fri, 22 Jul 2022 16:23:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id CAB121121319; Fri, 22 Jul 2022 16:23:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 14B3619451F3; Fri, 22 Jul 2022 16:23:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A90F31947049 for ; Fri, 22 Jul 2022 16:23:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9BC5C1121319; Fri, 22 Jul 2022 16:23:20 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.91]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2CE331121314; Fri, 22 Jul 2022 16:23:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658507015; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=iEW8YoSAOelDltoOkUvqF6iF+QiPWQCwuubUFQJgGlk=; b=iR+XmYLx5Mu7KAZlfh63ffLAeIGqIW2ezBgnucbRErvOxVbQa0YdCTpDJuLVmIcjtCQyRL zI6lYyxgxfZ8NEZL1Wg597mksFiVYnt+8otsD/fUCHNPMUyIn8NbqbS15TENVW/QEkih0/ UwFTEn4bjwvTqHDVqwaAEa8+97QYYmU= X-MC-Unique: IAvZ5YmrNZyKh9uVV7Gi9A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] qemu: support use of stateless EFI firmware Date: Fri, 22 Jul 2022 17:23:17 +0100 Message-Id: <20220722162317.2377173-3-berrange@redhat.com> In-Reply-To: <20220722162317.2377173-1-berrange@redhat.com> References: <20220722162317.2377173-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658507017953100003 When the attribute is set, the QEMU driver needs to do three things - Avoid looking for an NVRAM template - Avoid auto-populating an path - Find firmware descriptors with mode=3Dstateless instead of mode=3Dsplit Note, the first thing happens automatically when we solve the second thing. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_domain.c | 3 +- src/qemu/qemu_firmware.c | 48 +++++++++++-------- ...ware-auto-efi-stateless.x86_64-latest.args | 33 +++++++++++++ .../firmware-auto-efi-stateless.xml | 18 +++++++ ...re-manual-efi-stateless.x86_64-latest.args | 33 +++++++++++++ .../firmware-manual-efi-stateless.xml | 18 +++++++ tests/qemuxml2argvtest.c | 2 + 7 files changed, 135 insertions(+), 20 deletions(-) create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_= 64-latest.args create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-stateless.x8= 6_64-latest.args create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7df8041adf..b02ffc9a2e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4683,7 +4683,8 @@ qemuDomainDefPostParse(virDomainDef *def, } =20 if (virDomainDefHasOldStyleROUEFI(def) && - !def->os.loader->nvram) { + !def->os.loader->nvram && + def->os.loader->stateless !=3D VIR_TRISTATE_BOOL_YES) { def->os.loader->nvram =3D virStorageSourceNew(); def->os.loader->nvram->type =3D VIR_STORAGE_TYPE_FILE; def->os.loader->nvram->format =3D VIR_STORAGE_FILE_RAW; diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index c477b45d62..eb7abb0b32 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1110,10 +1110,18 @@ qemuFirmwareMatchDomain(const virDomainDef *def, return false; } =20 - if (fw->mapping.device =3D=3D QEMU_FIRMWARE_DEVICE_FLASH && - fw->mapping.data.flash.mode !=3D QEMU_FIRMWARE_FLASH_MODE_SPLIT) { - VIR_DEBUG("Discarding loader without split flash"); - return false; + if (fw->mapping.device =3D=3D QEMU_FIRMWARE_DEVICE_FLASH) { + if (def->os.loader && def->os.loader->stateless =3D=3D VIR_TRISTAT= E_BOOL_YES) { + if (fw->mapping.data.flash.mode !=3D QEMU_FIRMWARE_FLASH_MODE_= STATELESS) { + VIR_DEBUG("Discarding loader without stateless flash"); + return false; + } + } else { + if (fw->mapping.data.flash.mode !=3D QEMU_FIRMWARE_FLASH_MODE_= SPLIT) { + VIR_DEBUG("Discarding loader without split flash"); + return false; + } + } } =20 if (def->sec) { @@ -1175,27 +1183,29 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver, VIR_FREE(def->os.loader->path); def->os.loader->path =3D g_strdup(flash->executable.filename); =20 - if (STRNEQ(flash->nvram_template.format, "raw")) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("unsupported nvram template format '%s'"), - flash->nvram_template.format); - return -1; - } + if (flash->mode =3D=3D QEMU_FIRMWARE_FLASH_MODE_SPLIT) { + if (STRNEQ(flash->nvram_template.format, "raw")) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("unsupported nvram template format '%s'"), + flash->nvram_template.format); + return -1; + } =20 - VIR_FREE(def->os.loader->nvramTemplate); - def->os.loader->nvramTemplate =3D g_strdup(flash->nvram_template.f= ilename); + VIR_FREE(def->os.loader->nvramTemplate); + def->os.loader->nvramTemplate =3D g_strdup(flash->nvram_templa= te.filename); =20 - if (!def->os.loader->nvram) { - def->os.loader->nvram =3D virStorageSourceNew(); - def->os.loader->nvram->type =3D VIR_STORAGE_TYPE_FILE; - def->os.loader->nvram->format =3D VIR_STORAGE_FILE_RAW; - qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram->pa= th); + if (!def->os.loader->nvram) { + def->os.loader->nvram =3D virStorageSourceNew(); + def->os.loader->nvram->type =3D VIR_STORAGE_TYPE_FILE; + def->os.loader->nvram->format =3D VIR_STORAGE_FILE_RAW; + qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram= ->path); + } } =20 VIR_DEBUG("decided on firmware '%s' template '%s' NVRAM '%s'", def->os.loader->path, - def->os.loader->nvramTemplate, - def->os.loader->nvram->path); + NULLSTR(def->os.loader->nvramTemplate), + NULLSTR(def->os.loader->nvram ? def->os.loader->nvram->p= ath : NULL)); break; =20 case QEMU_FIRMWARE_DEVICE_KERNEL: diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-late= st.args b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.= args new file mode 100644 index 0000000000..89f733761e --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-fedora \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-fedora/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-fedora/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dfedora,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF.sev.fd","node= -name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,pflash0=3Dlibvirt-pfla= sh0-format,memory-backend=3Dpc.ram \ +-accel kvm \ +-cpu qemu64 \ +-m 8 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml b/tests= /qemuxml2argvdata/firmware-auto-efi-stateless.xml new file mode 100644 index 0000000000..1be0f4fd96 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml @@ -0,0 +1,18 @@ + + fedora + 63840878-0deb-4095-97e6-fc444d9bc9fa + 8192 + 1 + + hvm + + + + + + + /usr/bin/qemu-system-x86_64 + + + + diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-la= test.args b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-lat= est.args new file mode 100644 index 0000000000..fa4a677ce9 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.ar= gs @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-test-bios \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-test-bios/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-test-bios/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dtest-bios,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-test-bios/master-key.aes"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","nod= e-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,pflash0=3Dlibvirt-pflash0-form= at,memory-backend=3Dpc.ram \ +-accel tcg \ +-cpu qemu64 \ +-m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml b/tes= ts/qemuxml2argvdata/firmware-manual-efi-stateless.xml new file mode 100644 index 0000000000..6f2a4963b1 --- /dev/null +++ b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml @@ -0,0 +1,18 @@ + + test-bios + 362d1fc1-df7d-193e-5c18-49a71bd1da66 + 1048576 + 1 + + hvm + /usr/share/= OVMF/OVMF_CODE.fd + + + + + + /usr/bin/qemu-system-x86_64 + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 57d5f3e1c1..b72d61c3bc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1205,6 +1205,7 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST("firmware-manual-efi-stateless"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-template"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-nvram-template-st= ateless"); DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-iscsi"); @@ -1228,6 +1229,7 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-bios-not-stateless"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-bios-nvram"); DO_TEST_CAPS_LATEST("firmware-auto-efi"); + DO_TEST_CAPS_LATEST("firmware-auto-efi-stateless"); DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram"); DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-loader-insecure"); --=20 2.36.1