From nobody Fri Jan 9 08:52:05 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=1766967139; cv=none; d=zohomail.com; s=zohoarc; b=aKsWvi3acJTjn34oyz62QTGt6Ypwuj7VQ0wpLyXkG4eDzsThh0CIBnJxThsoF+C3K+SZFVfn7D52b3b6deNbCV4tmJF6BoGCARlHKU+OZkepqqq2wKqRfPwlMR/V6+GTFg1Wf11LdZ0Hv5i6VJHaAOyReRIJQaaHIktpwXzrwO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766967139; 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=24uv4QAEJwlAFFjkXp6tD+JyyQfUdkRVCOdm4KsM3oc=; b=HDIb56AG8ctyUJn8O8CIqj5pFqY8pO7EwlH4GNXrgMLFqueBsK4+bjK0uqBHVr97lHeXbXBU1PziiUzG3nEawvn57RtFbI9iEgG1W3Ml7XRyxSHcq7OneH8SkI0XOBnLRXwZod3cLUYQJwqc0Szcd+8DnjdifMpN48KxdIgIXOM= 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 1766967138990757.3552241578388; Sun, 28 Dec 2025 16:12:18 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 13C0A41B5C; Sun, 28 Dec 2025 19:12:16 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id B5C5D41BAB; Sun, 28 Dec 2025 18:58:43 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id C4681417EB; Sun, 28 Dec 2025 18:34:45 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 DF315417F3 for ; Sun, 28 Dec 2025 18:34:44 -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-150-H2l9aG5tPD2cGQzRGwMf2Q-1; Sun, 28 Dec 2025 18:34:42 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1A2EF1956088 for ; Sun, 28 Dec 2025 23:34:42 +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 5B21230001A8 for ; Sun, 28 Dec 2025 23:34:41 +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=1766964884; 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=24uv4QAEJwlAFFjkXp6tD+JyyQfUdkRVCOdm4KsM3oc=; b=gE8knmv+U8kG4ghjMPFUAa+2qTRuJxHUg3GH1J/jjxanjpXjw3SFeEDtwaPj/t26bs83/o E3n5tC2dyEbw1UPedH2uxDqUBR5+2Dsf8fBfwaPxQoaxtkfs68iIQ2LjWyulyma4c9TSlc 5FOIt7nj1zebBTDypaXIVpXY1yG4ADQ= X-MC-Unique: H2l9aG5tPD2cGQzRGwMf2Q-1 X-Mimecast-MFC-AGG-ID: H2l9aG5tPD2cGQzRGwMf2Q_1766964882 To: devel@lists.libvirt.org Subject: [PATCH 22/36] qemu_firmware: Introduce qemuFirmwareFillDomainCustom() Date: Mon, 29 Dec 2025 00:33:58 +0100 Message-ID: <20251228233412.1709869-23-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: bkOAJKDTt9k9CHtrgNXbFJbcCdMXy9qCAXzHIgl8Jrc_1766964882 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZRCRYWENWF47QR2MNWJ6HZOJPQCCIZCA X-Message-ID-Hash: ZRCRYWENWF47QR2MNWJ6HZOJPQCCIZCA 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: 1766967140268158500 Content-Type: text/plain; charset="utf-8"; x-default="true" Simple helper for the case where completely custom firmware paths are in use. It's quite trivial right now, but it will be expanded slightly in an upcoming commit. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_firmware.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 9dff3828a2..9b6c14701f 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1601,6 +1601,32 @@ qemuFirmwareFetchParsedConfigs(bool privileged, } =20 =20 +/** + * qemuFirmwareFillDomainCustom: + * @def: domain definition + * + * Fill in whatever information we can when totally custom firmware + * paths are in use. + * + * Should only be used as a fallback in case looking at the firmware + * descriptors yielded no results, and neither did going through the + * legacy list of CODE:VARS pairs. + */ +static void +qemuFirmwareFillDomainCustom(virDomainDef *def) +{ + virDomainLoaderDef *loader =3D def->os.loader; + + if (!loader) + return; + + if (!loader->format) + loader->format =3D VIR_STORAGE_FILE_RAW; + + return; +} + + /** * qemuFirmwareFillDomainLegacy: * @driver: QEMU driver @@ -1890,15 +1916,11 @@ qemuFirmwareFillDomain(virQEMUDriver *driver, if ((ret =3D qemuFirmwareFillDomainLegacy(driver, def)) < 0) return -1; =20 - /* If we've gotten this far without finding a match, it - * means that we're dealing with a set of completely - * custom paths. In that case, unless the user has - * specified otherwise, we have to assume that they're in - * raw format */ if (ret =3D=3D 1) { - if (loader && !loader->format) { - loader->format =3D VIR_STORAGE_FILE_RAW; - } + /* If we've gotten this far without finding a match, + * it means that we're dealing with a set of completely + * custom paths. We can still fill in some information */ + qemuFirmwareFillDomainCustom(def); } } else { virReportError(VIR_ERR_OPERATION_FAILED, --=20 2.52.0