From nobody Fri Jan 9 08:49:11 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=1766966280; cv=none; d=zohomail.com; s=zohoarc; b=YnFOcwXFMDIL23mp1Ea+utefP3wkAkiOckvoQJbvF0A3szFjJrxMC+Qj4f2Dzo9vjy+YKv5tu8PSzhX3QfWm0/tf7B5Xg259IauScISI3pHYI7Rcv7f6KAFkO0jwz8f/wKhM9h60Jfr/p33y1KorsqYM8db4X4Hrkjx5CDAzHKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766966280; 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=S4Q81qhbu2YDkyIJ24+8apzMwBIwQW2SvQioODKbTYc=; b=n6n88zOZ6leUk+PfT6BHg2S6ZdhJX+OoM9SNONX81zrFSYZtyYq8/3hJNSUqhXtRfDLNjMZrJK5bqW/Ay4n8uzb2/dqNmtI/HnrO/1K6iG68mTfSWXYial4dPT8fDDrfBfL3V5ut2NS/SrxFDQZvlsORHPdBktcUZntToD3sc24= 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 1766966280207620.9248095181136; Sun, 28 Dec 2025 15:58:00 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id B39993F344; Sun, 28 Dec 2025 18:57:58 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id C587341A82; Sun, 28 Dec 2025 18:50:34 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 048A8417F2; Sun, 28 Dec 2025 18:34:34 -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 157CC417EB for ; Sun, 28 Dec 2025 18:34:34 -0500 (EST) Received: from mx-prod-mc-08.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-637-jNX77JuMOZKXIM9TuIXg0A-1; Sun, 28 Dec 2025 18:34:32 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8C20818002C1 for ; Sun, 28 Dec 2025 23:34:31 +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 B37B230001A8 for ; Sun, 28 Dec 2025 23:34:30 +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=1766964873; 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=S4Q81qhbu2YDkyIJ24+8apzMwBIwQW2SvQioODKbTYc=; b=DL7O9knnDkg9VRLEPsc1fYfHCo61Shd98wkKRgXGr8K9fAT9GpK0f/M1L+PtRWurozULjm 6taHqLtyqE/2qWxm68vPR3qi+um4FW4eiBg2/nGHJZmIG/alHFMqJl1gaM49gKsRWviYn2 rJ9EFlC3xaMfL/hEUzogfQpGRi1P294= X-MC-Unique: jNX77JuMOZKXIM9TuIXg0A-1 X-Mimecast-MFC-AGG-ID: jNX77JuMOZKXIM9TuIXg0A_1766964871 To: devel@lists.libvirt.org Subject: [PATCH 13/36] qemu_firmware: Drop fallback for absent nvramTemplateFormat Date: Mon, 29 Dec 2025 00:33:49 +0100 Message-ID: <20251228233412.1709869-14-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: s51It7HAwAxj10U_YtQ2B4A_KH1zdiA5q-lSq4q1BN8_1766964871 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: P44K37L3KZT6V4KHX2D4RPSIBH2U2GD6 X-Message-ID-Hash: P44K37L3KZT6V4KHX2D4RPSIBH2U2GD6 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: 1766966281511158500 Content-Type: text/plain; charset="utf-8"; x-default="true" If this information is missing, the parsing code will consider the firmware descriptor to be invalid and matching against it will not even be attempted. So we can safely drop this redundant fallback. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_firmware.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 47a3987b64..9dff3828a2 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1421,14 +1421,8 @@ qemuFirmwareEnableFeaturesModern(virDomainDef *def, loader->nvramTemplateFormat =3D VIR_STORAGE_FILE_NONE; =20 if (!loader->nvram || virStorageSourceIsLocalStorage(loader->n= vram)) { - /* validation when parsing the JSON files ensures that we = get - * only 'raw' and 'qcow2' here. Fall back to sharing forma= t with loader */ - if (flash->nvram_template.format) - loader->nvramTemplateFormat =3D virStorageFileFormatTy= peFromString(flash->nvram_template.format); - else - loader->nvramTemplateFormat =3D loader->format; - loader->nvramTemplate =3D g_strdup(flash->nvram_template.f= ilename); + loader->nvramTemplateFormat =3D virStorageFileFormatTypeFr= omString(flash->nvram_template.format); } } =20 --=20 2.52.0