From nobody Fri Jan 9 08:55:43 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=1766967837; cv=none; d=zohomail.com; s=zohoarc; b=PQDwQTyLKWWasms7II+pAzLArh3iEeS+/G5Fh1S8sdoSX9LI7DDA8iURJdWgZlbiDaXw9BW6DCsXEDCDIP5k0/ls/4iQk8pMIETJ3EoB+9Ni6wYQTfsUKH2VlF2HADl9KZCSTjT6T9WqxiNByRkNyvc2ydbJqlRnZ+TXUtu05MQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766967837; 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=dcDarEq5YTxl1WLsfp1XOZ/nDr8Kp+3JM7PSrDYtFDI=; b=PqA5XPtRmt3cEQGp2mi2gsP6jmFpXwueUpP6t27i8DFmOgqZUkmtiS/gOQQIEYDtiLTsBjD70gCKgGentlme77ZHwouBLAFyL1TyiaObS3S5GcpouX8AdSdYbQZD2FYwKCiZbw4umOd9oluV+0GocwPmEbJSkO0Kcr6eYhZtAFM= 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 1766967837391640.7079079879364; Sun, 28 Dec 2025 16:23:57 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 5C6DB41831; Sun, 28 Dec 2025 19:23:55 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 30FFE43F02; Sun, 28 Dec 2025 19:10:44 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id A87E0417EB; Sun, 28 Dec 2025 18:34:56 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 58041417F2 for ; Sun, 28 Dec 2025 18:34:54 -0500 (EST) Received: from mx-prod-mc-03.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-586-D8AZXrYzMZS4Sof9Uf_DNg-1; Sun, 28 Dec 2025 18:34:52 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DAC7519560B2 for ; Sun, 28 Dec 2025 23:34:51 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.19]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C904730001A8 for ; Sun, 28 Dec 2025 23:34:50 +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=1766964894; 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=dcDarEq5YTxl1WLsfp1XOZ/nDr8Kp+3JM7PSrDYtFDI=; b=WBsj7m5BO+LjBgC+DPXlj0ngtfS7GxWjSnkI1dhFX5uEzw+2a27GfSmn6fE2GFBV5nadr4 rfwwqwEaUm9hRVdhcXdLDQXQMJMdgz01KARq4KG5JIDFP1XElMDlYxKajaKqMFA9crI8Th dsuxlfT505pRhbUao5Jc80a0Q5DeiAg= X-MC-Unique: D8AZXrYzMZS4Sof9Uf_DNg-1 X-Mimecast-MFC-AGG-ID: D8AZXrYzMZS4Sof9Uf_DNg_1766964892 To: devel@lists.libvirt.org Subject: [PATCH 30/36] qemu_firmware: Remove NVRAM to loader format copy hack Date: Mon, 29 Dec 2025 00:34:06 +0100 Message-ID: <20251228233412.1709869-31-abologna@redhat.com> In-Reply-To: <20251228233412.1709869-1-abologna@redhat.com> References: <20251228233412.1709869-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: JtSHMyZk1YI2rvxHS6gn6Tmo8i_Ri93qxLpmD99wHNI_1766964892 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WK4SA62COB2T7BO62N24YDH76PWI4H4C X-Message-ID-Hash: WK4SA62COB2T7BO62N24YDH76PWI4H4C 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: 1766967839131158500 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that the hack is gone, a few test cases that were failing before start succeeding instead. The firmware-auto-efi-format-nvramtemplate-qcow2 test case originally passed but produced wrong results, then started failing once we began taking templateFormat into account, and now passes once again, finally producing the correct results. The firmware-auto-efi-format-nvram-raw-loader-path and firmware-auto-efi-format-nvram-raw-nvramtemplate-path test cases, on the other hand, never passed before now, because the hack resulted in information contradicting those provided by the user being injected into the configuration, which in turn made it impossible to successfully pick a firmware build. With the hack gone they can finally succeed, as they should have in the first place. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_firmware.c | 19 ++-------- ...t-nvram-raw-loader-path.x86_64-latest.args | 37 ++++++++++++++++++ ...at-nvram-raw-loader-path.x86_64-latest.err | 1 - ...at-nvram-raw-loader-path.x86_64-latest.xml | 9 ++++- ...-raw-nvramtemplate-path.x86_64-latest.args | 37 ++++++++++++++++++ ...m-raw-nvramtemplate-path.x86_64-latest.err | 1 - ...m-raw-nvramtemplate-path.x86_64-latest.xml | 9 ++++- ...mat-nvramtemplate-qcow2.x86_64-latest.args | 38 +++++++++++++++++++ ...rmat-nvramtemplate-qcow2.x86_64-latest.err | 1 - ...rmat-nvramtemplate-qcow2.x86_64-latest.xml | 9 ++++- tests/qemuxmlconftest.c | 6 +-- 11 files changed, 139 insertions(+), 28 deletions(-) create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-ra= w-loader-path.x86_64-latest.args delete mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-ra= w-loader-path.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-ra= w-nvramtemplate-path.x86_64-latest.args delete mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-ra= w-nvramtemplate-path.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtem= plate-qcow2.x86_64-latest.args delete mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtem= plate-qcow2.x86_64-latest.err diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 8714538ba3..70ac88c373 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1859,21 +1859,6 @@ qemuFirmwareFillDomain(virQEMUDriver *driver, bool autoSelection =3D (def->os.firmware !=3D VIR_DOMAIN_OS_DEF_FIRMWA= RE_NONE); int ret; =20 - /* If there is no element but the element - * was present, copy the format from the latter to the - * former. - * - * This ensures that a configuration such as - * - * - * - * - * - * behaves as expected, that is, results in a firmware build - * with format 'foo' being selected */ - if (loader && loader->nvram && !loader->format) - loader->format =3D loader->nvram->format; - /* If we're loading an existing configuration from disk, we * should try as hard as possible to preserve historical * behavior. In particular, firmware autoselection being enabled @@ -1889,7 +1874,9 @@ qemuFirmwareFillDomain(virQEMUDriver *driver, def->os.loader =3D virDomainLoaderDefNew(); loader =3D def->os.loader; } - if (!loader->format) { + if (!loader->format && + !loader->nvramTemplateFormat && + (!loader->nvram || !loader->nvram->format)) { loader->format =3D VIR_STORAGE_FILE_RAW; } } diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-loade= r-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-= nvram-raw-loader-path.x86_64-latest.args new file mode 100644 index 0000000000..14027c21db --- /dev/null +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-loader-path.= x86_64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE_4M.= secboot.qcow2","node-name":"libvirt-pflash0-storage","auto-read-only":true,= "discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage","backing":null}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ +-accel kvm \ +-cpu qemu64 \ +-global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-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"}' \ +-global ICH9-LPC.noreboot=3Doff \ +-watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-loade= r-path.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-auto-efi-format-n= vram-raw-loader-path.x86_64-latest.err deleted file mode 100644 index 3edb2b3451..0000000000 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-loader-path.= x86_64-latest.err +++ /dev/null @@ -1 +0,0 @@ -operation failed: Unable to find 'efi' firmware that is compatible with th= e current configuration diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-loade= r-path.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-n= vram-raw-loader-path.x86_64-latest.xml index 6bb1ad1507..a02714d7b9 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-loader-path.= x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-loader-path.= x86_64-latest.xml @@ -6,12 +6,17 @@ 1 hvm - /usr/share/edk2/ovmf/OVMF_CODE_= 4M.secboot.qcow2 - + + + + + /usr/share/edk2/ovmf/OVMF_CODE_4M.secboot.qcow2 + /var/lib/libvirt/qemu/nvram/guest_VAR= S.fd + qemu64 diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-nvram= template-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-= format-nvram-raw-nvramtemplate-path.x86_64-latest.args new file mode 100644 index 0000000000..14027c21db --- /dev/null +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-nvramtemplat= e-path.x86_64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE_4M.= secboot.qcow2","node-name":"libvirt-pflash0-storage","auto-read-only":true,= "discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage","backing":null}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ +-accel kvm \ +-cpu qemu64 \ +-global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-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"}' \ +-global ICH9-LPC.noreboot=3Doff \ +-watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-nvram= template-path.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-auto-efi-f= ormat-nvram-raw-nvramtemplate-path.x86_64-latest.err deleted file mode 100644 index 3edb2b3451..0000000000 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-nvramtemplat= e-path.x86_64-latest.err +++ /dev/null @@ -1 +0,0 @@ -operation failed: Unable to find 'efi' firmware that is compatible with th= e current configuration diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-nvram= template-path.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-f= ormat-nvram-raw-nvramtemplate-path.x86_64-latest.xml index 8bb8f1b26c..a02714d7b9 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-nvramtemplat= e-path.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-nvramtemplat= e-path.x86_64-latest.xml @@ -6,12 +6,17 @@ 1 hvm - - + + + + + /usr/share/edk2/ovmf/OVMF_CODE_4M.secboot.qcow2 + /var/lib/libvirt/qemu/nvram/guest_VAR= S.fd + qemu64 diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtemplate-q= cow2.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nv= ramtemplate-qcow2.x86_64-latest.args new file mode 100644 index 0000000000..468ad4326c --- /dev/null +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtemplate-qcow2.x8= 6_64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE_4M.= secboot.qcow2","node-name":"libvirt-pflash0-storage","auto-read-only":true,= "discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage","backing":null}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"di= scard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"qcow2","file":"libvirt-pflash1-storage","backing":null}' \ +-machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-form= at,acpi=3Don \ +-accel kvm \ +-cpu qemu64 \ +-global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-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"}' \ +-global ICH9-LPC.noreboot=3Doff \ +-watchdog-action reset \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtemplate-q= cow2.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvr= amtemplate-qcow2.x86_64-latest.err deleted file mode 100644 index 3edb2b3451..0000000000 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtemplate-qcow2.x8= 6_64-latest.err +++ /dev/null @@ -1 +0,0 @@ -operation failed: Unable to find 'efi' firmware that is compatible with th= e current configuration diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtemplate-q= cow2.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvr= amtemplate-qcow2.x86_64-latest.xml index 1f039061ba..4061a0ae35 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtemplate-qcow2.x8= 6_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtemplate-qcow2.x8= 6_64-latest.xml @@ -6,12 +6,17 @@ 1 hvm - - + + + + + /usr/share/edk2/ovmf/OVMF_CODE_4M.secboot.qcow2 + /var/lib/libvirt/qemu/nvram/guest_V= ARS.qcow2 + qemu64 diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 75db051e32..a87863410f 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1610,11 +1610,11 @@ mymain(void) DO_TEST_CAPS_LATEST("firmware-auto-efi-format-nvram-qcow2-network-nbd"= ); DO_TEST_CAPS_LATEST("firmware-auto-efi-format-nvram-raw"); DO_TEST_CAPS_LATEST_ABI_UPDATE("firmware-auto-efi-format-nvram-raw"); - DO_TEST_CAPS_LATEST_FAILURE("firmware-auto-efi-format-nvram-raw-loader= -path"); - DO_TEST_CAPS_LATEST_FAILURE("firmware-auto-efi-format-nvram-raw-nvramt= emplate-path"); + DO_TEST_CAPS_LATEST("firmware-auto-efi-format-nvram-raw-loader-path"); + DO_TEST_CAPS_LATEST("firmware-auto-efi-format-nvram-raw-nvramtemplate-= path"); DO_TEST_CAPS_ARCH_LATEST("firmware-auto-efi-format-loader-raw", "aarch= 64"); DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-format-loader-r= aw", "aarch64"); - DO_TEST_CAPS_LATEST_FAILURE("firmware-auto-efi-format-nvramtemplate-qc= ow2"); + DO_TEST_CAPS_LATEST("firmware-auto-efi-format-nvramtemplate-qcow2"); DO_TEST_CAPS_LATEST("firmware-auto-efi-format-mismatch"); DO_TEST_CAPS_LATEST_FAILURE("firmware-auto-efi-format-mismatch-nvramte= mplate"); =20 --=20 2.52.0