commit: caf39557ab337b1c5265ab3d0e341bc41d628b3c Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Fri Feb 13 08:26:14 2026 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Fri Feb 13 08:26:14 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caf39557
app-emulation/libvirt: remove unused patch Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> ...-match_firwmare_with_fully_resolved_paths.patch | 52 ---------------------- 1 file changed, 52 deletions(-) diff --git a/app-emulation/libvirt/files/libvirt-11.6.0-match_firwmare_with_fully_resolved_paths.patch b/app-emulation/libvirt/files/libvirt-11.6.0-match_firwmare_with_fully_resolved_paths.patch deleted file mode 100644 index 7623521c9c22..000000000000 --- a/app-emulation/libvirt/files/libvirt-11.6.0-match_firwmare_with_fully_resolved_paths.patch +++ /dev/null @@ -1,52 +0,0 @@ -Upstream: https://gitlab.com/libvirt/libvirt/-/merge_requests/498 -Gentoo-Bug: https://bugs.gentoo.org/960591 - -diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c -index 2d0ec0b4fa228a0bdf996a4301b203f593a28ee0..b13b4f9abb1a0334c6f04a42d5373b8518eeb59c 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" - - #define VIR_FROM_THIS VIR_FROM_QEMU - -@@ -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 != QEMU_FIRMWARE_FLASH_MODE_SPLIT) - return false; -- if (STRNEQ(loader->nvramTemplate, flash->nvram_template.filename)) -+ if (!virFileComparePaths(loader->nvramTemplate, flash->nvram_template.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 = 0; i < cfg->nfirmwares; i++) { - virFirmware *fw = cfg->firmwares[i]; - -- if (STRNEQ(fw->name, loader->path)) { -+ if (!virFileComparePaths(fw->name, loader->path)) { - VIR_DEBUG("Not matching loader path '%s' for user provided path '%s'", - fw->name, loader->path); - continue;
