From nobody Fri Jan 9 08:52:40 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=1766967431; cv=none; d=zohomail.com; s=zohoarc; b=EtR3yY+Li5MGPB8FRjexE6ouS/EOBTtiuBwYY8qcj72AM2rf1gMNY6CWpiFEEyChKGPts7V8qef6aq+mtC3gpf5EvNbtSengaxiiKGZTeZM9Qylr0dMkBknzuNSunsLRlObpSoiBanEZGO9+69Zmqztw6LfUGeMB6tUtgv0Ihq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766967431; 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=urcYJhGvWyNGN+uMjaeVKjwvr2WFi/o43bf9V03i3Jo=; b=OUkuZ/v0yBYjxzTLkMSqpgbeaeFd5HDBzWfBYOKMjzyRl1GLNQBU3aqpgpGCy2Cxj21htaKtcMusBxgqEXrlFhLXf7LTlsCadPUUKXnUNj/8sZ8vUzZ58+clMTlReP5sXNbSerDOQ7S8sONKRh1mgHRWhxJS4k2K5dA6xcRx/T8= 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 1766967431474545.2420687961179; Sun, 28 Dec 2025 16:17:11 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 82C0241B31; Sun, 28 Dec 2025 19:16:46 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 30F7043DD4; Sun, 28 Dec 2025 19:02:21 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 95ACB417EB; Sun, 28 Dec 2025 18:34: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 654FD417F2 for ; Sun, 28 Dec 2025 18:34:48 -0500 (EST) Received: from mx-prod-mc-01.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-201-6qeYfFWNMiyVhVzqcQUI7g-1; Sun, 28 Dec 2025 18:34:46 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9E40C1956050 for ; Sun, 28 Dec 2025 23:34:45 +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 DFD3E30001A8 for ; Sun, 28 Dec 2025 23:34:44 +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=1766964888; 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=urcYJhGvWyNGN+uMjaeVKjwvr2WFi/o43bf9V03i3Jo=; b=fB6U7KvaOd/hUZxY9dO+o744vGfQeGuLP7DHy5kruyNcrCdZo32Acwvjnscu+MNxJ6UkOU dkJ7Hm5LYKNcg2PqX2IkITHfiUoT+a0yQG8TGRaV2SwxCGSp7MgyThWzhlJCz4Nfx4H/FD ewMSiHYlf1Ug7l4l2+UfG9CUFH3He9o= X-MC-Unique: 6qeYfFWNMiyVhVzqcQUI7g-1 X-Mimecast-MFC-AGG-ID: 6qeYfFWNMiyVhVzqcQUI7g_1766964885 To: devel@lists.libvirt.org Subject: [PATCH 25/36] qemu_firmware: Refactor setting NVRAM format Date: Mon, 29 Dec 2025 00:34:01 +0100 Message-ID: <20251228233412.1709869-26-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: 7w-y9OYmBSHTGbKm2Y0u8JUPQocnWgtao6h1NAQ0r7A_1766964885 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: JLXGGUTSJFAFITBUXLCMSFILDZQKWG7K X-Message-ID-Hash: JLXGGUTSJFAFITBUXLCMSFILDZQKWG7K 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: 1766967431632158500 Content-Type: text/plain; charset="utf-8"; x-default="true" Instead of setting the format every single time, knowing that we might throw away the entire definition immediately afterwards, and duplicating a check, only set it if we are going to perform an early return due to the rest of the definition being properly filled in already. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_firmware.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index a7bb8f7e45..f32e46cc8c 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -985,15 +985,16 @@ qemuFirmwareEnsureNVRAM(virDomainDef *def, if (loader->stateless =3D=3D VIR_TRISTATE_BOOL_YES) return; =20 - /* If the NVRAM format hasn't been set yet, inherit the same as - * the loader */ - if (loader->nvram && !loader->nvram->format) - loader->nvram->format =3D loader->format; - if (loader->nvram) { - /* Nothing to do if a proper NVRAM backend is already configured */ - if (!virStorageSourceIsEmpty(loader->nvram)) + /* If a proper NVRAM backend is already configured, we are + * done for the most part. We might still need to set the + * NVRAM format if that's missing though */ + if (!virStorageSourceIsEmpty(loader->nvram)) { + if (!loader->nvram->format) { + loader->nvram->format =3D loader->format; + } return; + } =20 /* otherwise we want to reset and re-populate the definition */ virObjectUnref(loader->nvram); --=20 2.52.0