From nobody Fri Jan 9 09:10:22 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=1766965297; cv=none; d=zohomail.com; s=zohoarc; b=gFL6SPIeQwWXadDVLKoCn/vn6ydcRUBuaMVewonnC+DIHgDpaUcs8bwSVpvtW/qjNR2jS9hWt5H6Nn5ZqVmig1AsKKeifE2+otI1dXT7Lj+w6NVfqH2dX+SW5V5+2Z8ld0BEyMYvSHH0hdFheDrBk0ZPprrBLrj7oDEWqsOIXrI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766965297; 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=38ps0/DQiBxnV3TvnW79sH4BIkWMPN0STPO2C+AVflk=; b=Cwyhq9YH+zHC+vc0z9CSH8bDobAGx5csSVCjzA0gpRmMEMQNfpk7y2HGtunkY4ucn3bDykxToKUARU+n/OC9fd1zkLZMm8HmhmZXm8gJ4rQ6LUuJUQBnu1pvUfs2RKSQOQkJKOJNrz+LGQWaMOouIl50bLWzlaXONTpKPH2FTJ4= 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 1766965297876859.1389965323082; Sun, 28 Dec 2025 15:41:37 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id E8ABC419FF; Sun, 28 Dec 2025 18:41:24 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 843F141A11; Sun, 28 Dec 2025 18:39:30 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 2F009417EB; Sun, 28 Dec 2025 18:34:22 -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 58DB8417EB for ; Sun, 28 Dec 2025 18:34:21 -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-433-XMNElJ2KMmGdOZMMDL9RXA-1; Sun, 28 Dec 2025 18:34:19 -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 952C71956050 for ; Sun, 28 Dec 2025 23:34:18 +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 A91B730001B9 for ; Sun, 28 Dec 2025 23:34:17 +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=1766964861; 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=38ps0/DQiBxnV3TvnW79sH4BIkWMPN0STPO2C+AVflk=; b=KVnG3GwmkUsE+cH2Q3JgOiuj0iAFAr1qb6lvTjqe9R/+Gjr1S09J1wtNze3XhoQ3/HuIdt XSN+N+Lh9s5lDeHyl8jmsvoFV7BbdbOO/mbmY9jXQ5rM7qOLwpvpmct7PfLl67il8hVwIq qNsy2Uk0xMxUtYuvLVsTFVIOMLupF2Y= X-MC-Unique: XMNElJ2KMmGdOZMMDL9RXA-1 X-Mimecast-MFC-AGG-ID: XMNElJ2KMmGdOZMMDL9RXA_1766964858 To: devel@lists.libvirt.org Subject: [PATCH 02/36] qemu_firmware: Drop 'nvram' local variable Date: Mon, 29 Dec 2025 00:33:38 +0100 Message-ID: <20251228233412.1709869-3-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: If16x_ohelXRWxOlNPgEk2obVFFTJereMzbFN-BHT90_1766964858 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VZGRZUYAN5VJKLLY3BRITMZSLCXUXF6F X-Message-ID-Hash: VZGRZUYAN5VJKLLY3BRITMZSLCXUXF6F 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: 1766965298681158500 Content-Type: text/plain; charset="utf-8"; x-default="true" We access the NVRAM information via the 'loader' local variable throughout the file, and this is the only spot where the 'nvram' local variable exists. It makes things inconsistent and opens up the possibility of the values for 'loader' and 'nvram' going out of sync, especially after a future commit will introduce the need to set the former. Just get rid of the additional variable. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_firmware.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index b168ec7cf7..903b0a984d 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1780,7 +1780,6 @@ qemuFirmwareFillDomain(virQEMUDriver *driver, bool abiUpdate) { virDomainLoaderDef *loader =3D def->os.loader; - virStorageSource *nvram =3D loader ? loader->nvram : NULL; bool autoSelection =3D (def->os.firmware !=3D VIR_DOMAIN_OS_DEF_FIRMWA= RE_NONE); int ret; =20 @@ -1804,13 +1803,14 @@ qemuFirmwareFillDomain(virQEMUDriver *driver, virStorageFileFormatTypeToString(loader->format)); return -1; } - if (nvram && - nvram->format && - nvram->format !=3D VIR_STORAGE_FILE_RAW && - nvram->format !=3D VIR_STORAGE_FILE_QCOW2) { + if (loader && + loader->nvram && + loader->nvram->format && + loader->nvram->format !=3D VIR_STORAGE_FILE_RAW && + loader->nvram->format !=3D VIR_STORAGE_FILE_QCOW2) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported nvram format '%1$s'"), - virStorageFileFormatTypeToString(nvram->format)); + virStorageFileFormatTypeToString(loader->nvram->for= mat)); return -1; } =20 --=20 2.52.0