From nobody Fri Jan 9 09:04:28 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=1766966111; cv=none; d=zohomail.com; s=zohoarc; b=NC0t9f/X20rGpco+c2TfalCdHQZP+Ti/6FRbXkda+CjMzSiZa3Fmuz9UCQsJXE59em/aVJyob4hiZTEZaTzL34hNTZEpAeQhehxWVv+MiX/v9AXDzQBO9ayyKXUkyNJObFaofjb9svo6ONkwwSUMhZifNr9CNYcFFRzZCWX4WIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766966111; 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=hE1fzRy0RnrmP9l7tYlm4yHvlski28tr1RAOlwo68bw=; b=ZunrThtTLtLLFT6Z2fDOhBprhZQNVlM7uVeKRuu3Ek9oPZZmiEMhuVp4vMUBCgCZAoHWC2h9RjLeh+KFnPxK0+s1WfmVlP3tUGMay9S0JAhwCVszKOxjHVc5dhZEqcuTXkUA43pbMWGbkhk4tN20oNO0nTQBI3/ETmSwpI3JGYU= 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 1766966111967380.49464442129204; Sun, 28 Dec 2025 15:55:11 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 0AD43419FD; Sun, 28 Dec 2025 18:55:10 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id CB44441901; Sun, 28 Dec 2025 18:48:02 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 4F6B2417F4; Sun, 28 Dec 2025 18:34:33 -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 2B97B417F0 for ; Sun, 28 Dec 2025 18:34:32 -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-654-HhiJmCdkN122GhrPvO9Ejw-1; Sun, 28 Dec 2025 18:34:29 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 193B61800358 for ; Sun, 28 Dec 2025 23:34:29 +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 5B39530001A8 for ; Sun, 28 Dec 2025 23:34:28 +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=1766964871; 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=hE1fzRy0RnrmP9l7tYlm4yHvlski28tr1RAOlwo68bw=; b=J4UQ1nTLbyP3MFoY8W7i4vIs2Y5vD1+RmDIQYfEtxo8t+7TckkBDJeFUQdxgE7Iv4X9PYl Ri5MNfoYTWWZOs3FadABX601PCljzuINc05I+QYQBWDCxx1QYwBQ1f5V6YjWOJ2mEdnch+ 6j6hxz0F5L+NjAncHJlCrhY73+FEpeQ= X-MC-Unique: HhiJmCdkN122GhrPvO9Ejw-1 X-Mimecast-MFC-AGG-ID: HhiJmCdkN122GhrPvO9Ejw_1766964869 To: devel@lists.libvirt.org Subject: [PATCH 11/36] domain_validate: Reject ROMs with format other than raw Date: Mon, 29 Dec 2025 00:33:47 +0100 Message-ID: <20251228233412.1709869-12-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: _8WzINwj0dGnTpKE9BYiAwbqkSifdMyhjLYaIy2PeI0_1766964869 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XFACBDNNSIVPIQTTZ6DLCSLR3REGMBCA X-Message-ID-Hash: XFACBDNNSIVPIQTTZ6DLCSLR3REGMBCA 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: 1766966113026158500 Content-Type: text/plain; charset="utf-8"; x-default="true" The combination doesn't make sense. After this change the firmware-auto-efi-format-loader-qcow2-rom test case starts failing, as it should have in the first place. Signed-off-by: Andrea Bolognani --- src/conf/domain_validate.c | 10 +++++ ...format-loader-qcow2-rom.x86_64-latest.args | 34 ---------------- ...-format-loader-qcow2-rom.x86_64-latest.err | 1 + ...-format-loader-qcow2-rom.x86_64-latest.xml | 39 ------------------- tests/qemuxmlconftest.c | 2 +- 5 files changed, 12 insertions(+), 74 deletions(-) delete mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-loader-q= cow2-rom.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-loader-q= cow2-rom.x86_64-latest.err delete mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-format-loader-q= cow2-rom.x86_64-latest.xml diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 93a54f8cc7..7346a61731 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1811,6 +1811,16 @@ virDomainDefOSValidate(const virDomainDef *def, } } =20 + if (loader->type =3D=3D VIR_DOMAIN_LOADER_TYPE_ROM) { + if (loader->format && + loader->format !=3D VIR_STORAGE_FILE_RAW) { + virReportError(VIR_ERR_XML_DETAIL, + _("Invalid format '%1$s' for ROM loader type"), + virStorageFileFormatTypeToString(loader->format= )); + return -1; + } + } + if (def->os.shim && !def->os.kernel) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("shim only allowed with kernel option")); diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-ro= m.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loade= r-qcow2-rom.x86_64-latest.args deleted file mode 100644 index 417084d45e..0000000000 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-rom.x86_6= 4-latest.args +++ /dev/null @@ -1,34 +0,0 @@ -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"}' \ --machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,acpi=3Don \ --accel kvm \ --cpu qemu64 \ --bios /usr/share/edk2/ovmf/OVMF.inteltdx.secboot.fd \ --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-loader-qcow2-ro= m.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader= -qcow2-rom.x86_64-latest.err new file mode 100644 index 0000000000..b7b1400f6a --- /dev/null +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-rom.x86_6= 4-latest.err @@ -0,0 +1 @@ +Invalid format 'qcow2' for ROM loader type diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-ro= m.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader= -qcow2-rom.x86_64-latest.xml deleted file mode 100644 index 862a50ddb4..0000000000 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-rom.x86_6= 4-latest.xml +++ /dev/null @@ -1,39 +0,0 @@ - - guest - 63840878-0deb-4095-97e6-fc444d9bc9fa - 1048576 - 1048576 - 1 - - hvm - - - - - /usr/share/edk2/ovmf/OVMF.intelt= dx.secboot.fd - - - - - - - qemu64 - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - -
- - - - -