From nobody Fri Jan 9 09:06:59 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=1766968978; cv=none; d=zohomail.com; s=zohoarc; b=lY0hDBqWINkyhn4YBUuZfMbin+S4vo+dZynk3pXJtBu5ywX5EYGdJdsbReFiMd/t5OspifiFFo3ZJyTMmkDnOUvBiXN22St+qgey8iFxNs/2f/+cGzFFVp8iXS1mfAg3HaK9eWVQct5gpFRkDFBH+VbqFrJrF+b5tG+fBGS5FLs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766968978; 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=hTntU4tYHgypZP0iS0ghrn8ATKYKvpd0nBNss8iLhkM=; b=fQEFbDTt9X1ZVkpUu1srH9oeSPRPk6/PfG1Vxj+Kiy2WfknX3B5Z9NCyC5T6m6cJoLApBOm3bo3ShQKPDaXDqtr4ZcvjnMtgrgT3tuVkM10VKLmxltEHt8oJp5PO7AjXGbyAP5ohollgld4ZF4EHUU8ZOYyv2UNIwddPNkT5maI= 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 1766968978786446.9321841663543; Sun, 28 Dec 2025 16:42:58 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id C8D1941C09; Sun, 28 Dec 2025 19:42:36 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0099C43FE0; Sun, 28 Dec 2025 19:34:31 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id B197E41903; Sun, 28 Dec 2025 18:49:18 -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 B75E641BD8 for ; Sun, 28 Dec 2025 18:41:02 -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-425-BZqvGfp_MyCAM8p295TL6A-1; Sun, 28 Dec 2025 18:41:00 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 466C81800654 for ; Sun, 28 Dec 2025 23:40:59 +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 8800B180035A for ; Sun, 28 Dec 2025 23:40:58 +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=1766965262; 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=hTntU4tYHgypZP0iS0ghrn8ATKYKvpd0nBNss8iLhkM=; b=HLd3XFMk+plRvd6QIa54/vJD+POx033BBBQcsK7nZ2IZR9wc8X3n20Exwle6K6NZj4Gjj/ BgUklkx3QuSlfKHVDXw/kO3wGjpdMHAcCjV7IfErBKIAtvd9pkjzTmnF55XvYyIBx58s3f j3rWDM9siZEc4pjX8z1PgstFAYMhnik= X-MC-Unique: BZqvGfp_MyCAM8p295TL6A-1 X-Mimecast-MFC-AGG-ID: BZqvGfp_MyCAM8p295TL6A_1766965259 To: devel@lists.libvirt.org Subject: [PATCH 06/29] qemu_firmware: Rename qemuFirmwareFlashFile to qemuFirmwareFile Date: Mon, 29 Dec 2025 00:40:25 +0100 Message-ID: <20251228234048.1711701-7-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: _wX0ryXQZ9zNqdXHFZI3xy5b7oVa6D8wmbcun-U069E_1766965259 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: MGJSM6SZ6K35AAI6UGCMPARRQ3FS2SMI X-Message-ID-Hash: MGJSM6SZ6K35AAI6UGCMPARRQ3FS2SMI 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: 1766968980381158500 Content-Type: text/plain; charset="utf-8"; x-default="true" This type is currently only used when working with pflash firmware builds, so the name is accurate, but we are about to extend its usage to ROM builds as well. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_firmware.c | 47 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 52205b72f8..e3471d9adb 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -61,6 +61,13 @@ VIR_ENUM_IMPL(qemuFirmwareOSInterface, ); =20 =20 +typedef struct _qemuFirmwareFile qemuFirmwareFile; +struct _qemuFirmwareFile { + char *filename; + char *format; +}; + + typedef enum { QEMU_FIRMWARE_FLASH_MODE_SPLIT, QEMU_FIRMWARE_FLASH_MODE_COMBINED, @@ -77,18 +84,12 @@ VIR_ENUM_IMPL(qemuFirmwareFlashMode, "stateless", ); =20 -typedef struct _qemuFirmwareFlashFile qemuFirmwareFlashFile; -struct _qemuFirmwareFlashFile { - char *filename; - char *format; -}; - =20 typedef struct _qemuFirmwareMappingFlash qemuFirmwareMappingFlash; struct _qemuFirmwareMappingFlash { qemuFirmwareFlashMode mode; - qemuFirmwareFlashFile executable; - qemuFirmwareFlashFile nvram_template; + qemuFirmwareFile executable; + qemuFirmwareFile nvram_template; }; =20 =20 @@ -198,7 +199,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuFirmwareOSInterface, = qemuFirmwareOSInterfaceFr =20 =20 static void -qemuFirmwareFlashFileFreeContent(qemuFirmwareFlashFile *flash) +qemuFirmwareFileFreeContent(qemuFirmwareFile *flash) { g_free(flash->filename); g_free(flash->format); @@ -208,8 +209,8 @@ qemuFirmwareFlashFileFreeContent(qemuFirmwareFlashFile = *flash) static void qemuFirmwareMappingFlashFreeContent(qemuFirmwareMappingFlash *flash) { - qemuFirmwareFlashFileFreeContent(&flash->executable); - qemuFirmwareFlashFileFreeContent(&flash->nvram_template); + qemuFirmwareFileFreeContent(&flash->executable); + qemuFirmwareFileFreeContent(&flash->nvram_template); } =20 =20 @@ -325,9 +326,9 @@ qemuFirmwareInterfaceParse(const char *path, =20 =20 static int -qemuFirmwareFlashFileParse(const char *path, - virJSONValue *doc, - qemuFirmwareFlashFile *flash) +qemuFirmwareFileParse(const char *path, + virJSONValue *doc, + qemuFirmwareFile *fwfile) { const char *filename; const char *format; @@ -337,14 +338,14 @@ qemuFirmwareFlashFileParse(const char *path, return -1; } =20 - flash->filename =3D g_strdup(filename); + fwfile->filename =3D g_strdup(filename); =20 if (!(format =3D virJSONValueObjectGetString(doc, "format"))) { VIR_DEBUG("missing 'format' in '%s'", path); return -1; } =20 - flash->format =3D g_strdup(format); + fwfile->format =3D g_strdup(format); =20 return 0; } @@ -382,7 +383,7 @@ qemuFirmwareMappingFlashParse(const char *path, return -1; } =20 - if (qemuFirmwareFlashFileParse(path, executable, &flash->executable) <= 0) + if (qemuFirmwareFileParse(path, executable, &flash->executable) < 0) return -1; =20 if (flash->mode =3D=3D QEMU_FIRMWARE_FLASH_MODE_SPLIT) { @@ -391,7 +392,7 @@ qemuFirmwareMappingFlashParse(const char *path, return -1; } =20 - if (qemuFirmwareFlashFileParse(path, nvram_template, &flash->nvram= _template) < 0) + if (qemuFirmwareFileParse(path, nvram_template, &flash->nvram_temp= late) < 0) return -1; } =20 @@ -637,19 +638,19 @@ qemuFirmwareInterfaceFormat(virJSONValue *doc, =20 =20 static virJSONValue * -qemuFirmwareFlashFileFormat(qemuFirmwareFlashFile flash) +qemuFirmwareFileFormat(qemuFirmwareFile fwfile) { g_autoptr(virJSONValue) json =3D virJSONValueNewObject(); virJSONValue *ret; =20 if (virJSONValueObjectAppendString(json, "filename", - flash.filename) < 0) + fwfile.filename) < 0) return NULL; =20 if (virJSONValueObjectAppendString(json, "format", - flash.format) < 0) + fwfile.format) < 0) return NULL; =20 ret =3D g_steal_pointer(&json); @@ -669,7 +670,7 @@ qemuFirmwareMappingFlashFormat(virJSONValue *mapping, qemuFirmwareFlashModeTypeToString(f= lash->mode)) < 0) return -1; =20 - if (!(executable =3D qemuFirmwareFlashFileFormat(flash->executable))) + if (!(executable =3D qemuFirmwareFileFormat(flash->executable))) return -1; =20 if (virJSONValueObjectAppend(mapping, @@ -678,7 +679,7 @@ qemuFirmwareMappingFlashFormat(virJSONValue *mapping, return -1; =20 if (flash->mode =3D=3D QEMU_FIRMWARE_FLASH_MODE_SPLIT) { - if (!(nvram_template =3D qemuFirmwareFlashFileFormat(flash->nvram_= template))) + if (!(nvram_template =3D qemuFirmwareFileFormat(flash->nvram_templ= ate))) return -1; =20 if (virJSONValueObjectAppend(mapping, --=20 2.52.0