From nobody Mon Sep 8 17:08:16 2025 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; Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=gentoo.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 175343142136638.02507489880236; Fri, 25 Jul 2025 01:17:01 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0B31011D8; Fri, 25 Jul 2025 04:17:00 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F2D4EC51; Fri, 25 Jul 2025 04:16:40 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C3119C7C; Thu, 24 Jul 2025 10:00:02 -0400 (EDT) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 17867BDE for ; Thu, 24 Jul 2025 10:00:01 -0400 (EDT) Received: from ignea.. (unknown [194.69.102.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: chewi) by smtp.gentoo.org (Postfix) with ESMTPSA id 966183410EE; Thu, 24 Jul 2025 13:51:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=FORGED_SPF_HELO, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 X-Greylist: delayed 484 seconds by postgrey-1.37 at lists.libvirt.org; Thu, 24 Jul 2025 10:00:01 EDT From: James Le Cuirot To: devel@lists.libvirt.org Subject: [PATCH 1/2] util: Fully resolve paths with virFileComparePaths Date: Thu, 24 Jul 2025 14:49:37 +0100 Message-ID: <20250724135144.129082-2-chewi@gentoo.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250724135144.129082-1-chewi@gentoo.org> References: <20250724135144.129082-1-chewi@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MailFrom: chewi@gentoo.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 Message-ID-Hash: OZRUHJPEDOB4OFSRPX2GOVEGTEKH2VDQ X-Message-ID-Hash: OZRUHJPEDOB4OFSRPX2GOVEGTEKH2VDQ X-Mailman-Approved-At: Fri, 25 Jul 2025 08:16:38 -0400 CC: James Le Cuirot X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZM-MESSAGEID: 1753431424342116600 Content-Type: text/plain; charset="utf-8" From: James Le Cuirot The description says it "resolve all symlinks", but it was only resolving the last component. Signed-off-by: James Le Cuirot Reviewed-by: Michal Privoznik --- src/util/virfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 3b7a795..a5c9fbe 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -4108,11 +4108,11 @@ virFileComparePaths(const char *p1, const char *p2) * 'sysfs', since they're no real paths so fallback to plain string * comparison. */ - ignore_value(virFileResolveLink(p1, &res1)); + ignore_value(virFileResolveAllLinks(p1, &res1)); if (!res1) res1 =3D g_strdup(p1); =20 - ignore_value(virFileResolveLink(p2, &res2)); + ignore_value(virFileResolveAllLinks(p2, &res2)); if (!res2) res2 =3D g_strdup(p2); =20 --=20 2.49.0 From nobody Mon Sep 8 17:08:16 2025 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; Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=gentoo.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1753431442308385.2462289811207; Fri, 25 Jul 2025 01:17:22 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 473E0D4E; Fri, 25 Jul 2025 04:17:21 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5D1B311C8; Fri, 25 Jul 2025 04:16:42 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CBC54BDC; Thu, 24 Jul 2025 10:00:02 -0400 (EDT) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 27A42BDC for ; Thu, 24 Jul 2025 10:00:01 -0400 (EDT) Received: from ignea.. (unknown [194.69.102.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: chewi) by smtp.gentoo.org (Postfix) with ESMTPSA id 932D03415CB; Thu, 24 Jul 2025 13:51:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=FORGED_SPF_HELO, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 From: James Le Cuirot To: devel@lists.libvirt.org Subject: [PATCH 2/2] qemu: Match firmware with fully resolved and canonicalized paths Date: Thu, 24 Jul 2025 14:49:38 +0100 Message-ID: <20250724135144.129082-3-chewi@gentoo.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250724135144.129082-1-chewi@gentoo.org> References: <20250724135144.129082-1-chewi@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MailFrom: chewi@gentoo.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 Message-ID-Hash: X2IEAPVXE4IMIOZONTYFG6FEZN7ESKKI X-Message-ID-Hash: X2IEAPVXE4IMIOZONTYFG6FEZN7ESKKI X-Mailman-Approved-At: Fri, 25 Jul 2025 08:16:38 -0400 CC: James Le Cuirot X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZM-MESSAGEID: 1753431443501116600 Content-Type: text/plain; charset="utf-8" From: James Le Cuirot Distros may provide compatibility symlinks after moving firmware files around, but they won't work for existing VMs when doing a straight string comparison. I tried to compare inodes instead, but even glib doesn't provide a straightforward cross-platform method to do this. Resolves: https://bugs.gentoo.org/960591 Signed-off-by: James Le Cuirot Reviewed-by: Michal Privoznik --- src/qemu/qemu_firmware.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 2d0ec0b..b13b4f9 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -33,6 +33,7 @@ #include "viralloc.h" #include "virenum.h" #include "virstring.h" +#include "virfile.h" =20 #define VIR_FROM_THIS VIR_FROM_QEMU =20 @@ -937,23 +938,23 @@ qemuFirmwareMatchesPaths(const qemuFirmware *fw, switch (fw->mapping.device) { case QEMU_FIRMWARE_DEVICE_FLASH: if (loader && loader->path && - STRNEQ(loader->path, flash->executable.filename)) + !virFileComparePaths(loader->path, flash->executable.filename)) return false; if (loader && loader->nvramTemplate) { if (flash->mode !=3D QEMU_FIRMWARE_FLASH_MODE_SPLIT) return false; - if (STRNEQ(loader->nvramTemplate, flash->nvram_template.filena= me)) + if (!virFileComparePaths(loader->nvramTemplate, flash->nvram_t= emplate.filename)) return false; } break; case QEMU_FIRMWARE_DEVICE_MEMORY: if (loader && loader->path && - STRNEQ(loader->path, memory->filename)) + !virFileComparePaths(loader->path, memory->filename)) return false; break; case QEMU_FIRMWARE_DEVICE_KERNEL: if (kernelPath && - STRNEQ(kernelPath, kernel->filename)) + !virFileComparePaths(kernelPath, kernel->filename)) return false; break; case QEMU_FIRMWARE_DEVICE_NONE: @@ -1657,7 +1658,7 @@ qemuFirmwareFillDomainLegacy(virQEMUDriver *driver, for (i =3D 0; i < cfg->nfirmwares; i++) { virFirmware *fw =3D cfg->firmwares[i]; =20 - if (STRNEQ(fw->name, loader->path)) { + if (!virFileComparePaths(fw->name, loader->path)) { VIR_DEBUG("Not matching loader path '%s' for user provided pat= h '%s'", fw->name, loader->path); continue; --=20 2.49.0