From nobody Fri Jan 9 09:11: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=1766969052; cv=none; d=zohomail.com; s=zohoarc; b=faxs1t7D83SCTHKXRY0MGSrQzH8ZEbI6vney3IF/u2O2j2BLjWrWiR5yRQdj80mJNkmIO+OKM+5pVulqTHTUbYVmK2nN913oU7D+r9th3t5CLzMfKmKzyBv6K30teiBQbxXybYW4s3c7o60TpH/kzx6aqyb9FZJ1bWug/bquScQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766969052; 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=DrYYbJGbJo1sm+r+4AC6MgmiR3fA4Y8wwzk0mWpVkW8=; b=Xm0VOXWfRxD8JxUcq1ejvn21XyCb3m2pejXHy2xbJQm21LHyPW42W2bCjl+k2c1a+CC8kUr4+0xW3gENJHkEGKecgGV2HagMB9B0i+uNZePtc1N9yFVXeXTuZjJg9SncTNA/UQS0clk5qZOboX5suYh0U6DBGgFuMjcfplKU9vU= 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 1766969052525605.9884414617799; Sun, 28 Dec 2025 16:44:12 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 830644193D; Sun, 28 Dec 2025 19:44:09 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0119241C4D; Sun, 28 Dec 2025 19:36:51 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id A9CE941A27; Sun, 28 Dec 2025 18:49:25 -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 B05D74186D for ; Sun, 28 Dec 2025 18:41:03 -0500 (EST) Received: from mx-prod-mc-05.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-687-8O7FYQL0PKGxX7OTdRB95Q-1; Sun, 28 Dec 2025 18:41:01 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7311E1956089 for ; Sun, 28 Dec 2025 23:41:00 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.19]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B4BED1800367 for ; Sun, 28 Dec 2025 23:40:59 +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=1766965263; 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=DrYYbJGbJo1sm+r+4AC6MgmiR3fA4Y8wwzk0mWpVkW8=; b=UEAaIF08po1NeEi6SlNnkWgcYs+6YQgl1vqiol7MPr6wZolBS4rNImVe0BPiTF1uDBus+0 BFAx90nQm3O0QF1ArFbBVyX8Uu/d9WmqYEFE7OzCrDpE520/DWiIqFclKK1GybtX8208vZ 3N41Dqd1NgVRK4r+eXa+Lo4iVqWHY+c= X-MC-Unique: 8O7FYQL0PKGxX7OTdRB95Q-1 X-Mimecast-MFC-AGG-ID: 8O7FYQL0PKGxX7OTdRB95Q_1766965260 To: devel@lists.libvirt.org Subject: [PATCH 07/29] qemu_firmware: Use qemuFirmwareFile in qemuFirmwareMappingMemory Date: Mon, 29 Dec 2025 00:40:26 +0100 Message-ID: <20251228234048.1711701-8-abologna@redhat.com> In-Reply-To: <20251228234048.1711701-1-abologna@redhat.com> References: <20251228234048.1711701-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: pj7SU-Fjbgctq4bmCODOHrH9v7xjoYh5jnUGIaB2zA8_1766965260 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EV4CQOC2IKYQDA4BBO7RTUFV3JK33YGI X-Message-ID-Hash: EV4CQOC2IKYQDA4BBO7RTUFV3JK33YGI 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: 1766969054576158500 Content-Type: text/plain; charset="utf-8"; x-default="true" Not very useful for now, but sets the stage for further changes. 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 e3471d9adb..5f5550424f 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -95,7 +95,7 @@ struct _qemuFirmwareMappingFlash { =20 typedef struct _qemuFirmwareMappingMemory qemuFirmwareMappingMemory; struct _qemuFirmwareMappingMemory { - char *filename; + qemuFirmwareFile executable; }; =20 =20 @@ -217,7 +217,7 @@ qemuFirmwareMappingFlashFreeContent(qemuFirmwareMapping= Flash *flash) static void qemuFirmwareMappingMemoryFreeContent(qemuFirmwareMappingMemory *memory) { - g_free(memory->filename); + qemuFirmwareFileFreeContent(&memory->executable); } =20 =20 @@ -412,7 +412,8 @@ qemuFirmwareMappingMemoryParse(const char *path, return -1; } =20 - memory->filename =3D g_strdup(filename); + memory->executable.filename =3D g_strdup(filename); + memory->executable.format =3D g_strdup("raw"); =20 return 0; } @@ -698,7 +699,7 @@ qemuFirmwareMappingMemoryFormat(virJSONValue *mapping, { if (virJSONValueObjectAppendString(mapping, "filename", - memory->filename) < 0) + memory->executable.filename) < 0) return -1; =20 return 0; @@ -890,7 +891,7 @@ qemuFirmwareMatchesPaths(const qemuFirmware *fw, break; case QEMU_FIRMWARE_DEVICE_MEMORY: if (loader && loader->path && - !virFileComparePaths(loader->path, memory->filename)) + !virFileComparePaths(loader->path, memory->executable.filename= )) return false; break; case QEMU_FIRMWARE_DEVICE_NONE: @@ -1481,7 +1482,7 @@ qemuFirmwareEnableFeaturesModern(virDomainDef *def, loader->format =3D VIR_STORAGE_FILE_RAW; =20 VIR_FREE(loader->path); - loader->path =3D g_strdup(memory->filename); + loader->path =3D g_strdup(memory->executable.filename); =20 VIR_DEBUG("decided on loader '%s'", loader->path); @@ -2078,7 +2079,7 @@ qemuFirmwareGetSupported(const char *machine, break; =20 case QEMU_FIRMWARE_DEVICE_MEMORY: - fwpath =3D memory->filename; + fwpath =3D memory->executable.filename; break; =20 case QEMU_FIRMWARE_DEVICE_NONE: --=20 2.52.0