From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 29 Jul 2025 11:05:09 +0000 (+0200)
Subject: Revert "qemu: Match firmware with fully resolved and canonicalized paths"
X-Git-Tag: v11.6.0-rc2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=925040d7bbe7b726e0f249a997136a9856c4cd9c;p=thirdparty%2Flibvirt.git

Revert "qemu: Match firmware with fully resolved and canonicalized paths"

The canonicalization of the paths is not mocked properly and thus the
tests depend on the host system. While the tests do pass on our CI they
break on real deployments at least on Fedora 42.

Since we're in code freeze for the upcoming release, revert the patch
instead of attempts to fix it.

This reverts commit 4efea21ae8709c6741a1800bd26ae6b49c8a77f5.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index 69e77d66f5..f10137144e 100644
--- a/src/qemu/qemu_firmware.c
+++ b/src/qemu/qemu_firmware.c
@@ -33,7 +33,6 @@
 #include "viralloc.h"
 #include "virenum.h"
 #include "virstring.h"
-#include "virfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 
@@ -940,23 +939,23 @@ qemuFirmwareMatchesPaths(const qemuFirmware *fw,
     switch (fw->mapping.device) {
     case QEMU_FIRMWARE_DEVICE_FLASH:
         if (loader && loader->path &&
-            !virFileComparePaths(loader->path, flash->executable.filename))
+            STRNEQ(loader->path, flash->executable.filename))
             return false;
         if (loader && loader->nvramTemplate) {
             if (flash->mode != QEMU_FIRMWARE_FLASH_MODE_SPLIT)
                 return false;
-            if (!virFileComparePaths(loader->nvramTemplate, flash->nvram_template.filename))
+            if (STRNEQ(loader->nvramTemplate, flash->nvram_template.filename))
                 return false;
         }
         break;
     case QEMU_FIRMWARE_DEVICE_MEMORY:
         if (loader && loader->path &&
-            !virFileComparePaths(loader->path, memory->filename))
+            STRNEQ(loader->path, memory->filename))
             return false;
         break;
     case QEMU_FIRMWARE_DEVICE_KERNEL:
         if (kernelPath &&
-            !virFileComparePaths(kernelPath, kernel->filename))
+            STRNEQ(kernelPath, kernel->filename))
             return false;
         break;
     case QEMU_FIRMWARE_DEVICE_NONE:
@@ -1677,7 +1676,7 @@ qemuFirmwareFillDomainLegacy(virQEMUDriver *driver,
     for (i = 0; i < cfg->nfirmwares; i++) {
         virFirmware *fw = cfg->firmwares[i];
 
-        if (!virFileComparePaths(fw->name, loader->path)) {
+        if (STRNEQ(fw->name, loader->path)) {
             VIR_DEBUG("Not matching loader path '%s' for user provided path '%s'",
                       fw->name, loader->path);
             continue;