From e18f994f97e53598a43a29da114144a12b1b8d95 Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Fri, 25 Jul 2025 12:09:23 +0200 Subject: [PATCH] libvirt-11.5.0-3.el10 - qemu_tpm: Do not use persistent definition during pre-start checks (RHEL-80155) Resolves: RHEL-80155 --- ...t-definition-during-pre-start-checks.patch | 43 +++++++++++++++++++ libvirt.spec | 9 +++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 libvirt-qemu_tpm-Do-not-use-persistent-definition-during-pre-start-checks.patch diff --git a/libvirt-qemu_tpm-Do-not-use-persistent-definition-during-pre-start-checks.patch b/libvirt-qemu_tpm-Do-not-use-persistent-definition-during-pre-start-checks.patch new file mode 100644 index 0000000..c12f838 --- /dev/null +++ b/libvirt-qemu_tpm-Do-not-use-persistent-definition-during-pre-start-checks.patch @@ -0,0 +1,43 @@ +From 49a0c4d4d371eb030090e0172144bce00b6e1044 Mon Sep 17 00:00:00 2001 +Message-ID: <49a0c4d4d371eb030090e0172144bce00b6e1044.1753438163.git.jdenemar@redhat.com> +From: Martin Kletzander +Date: Fri, 18 Jul 2025 14:47:58 +0200 +Subject: [PATCH] qemu_tpm: Do not use persistent definition during pre-start + checks + +Commit 3451987fca7c used the persistent TPM Definition in both calls to +qemuTPMVirCommandSwtpmAddTPMState() but in one of the two cases it +might've been NULL and what's more, it is not the right definition which +should've been used. Change that to @tpm which is the current +definition. The other call does not have access to the current +definition and is only called during updating the profile. But for the +sake of fewer future mistakes, keep the other one as is because there is +no issue with calling it that way and adding logic that just skips the +extra check on NULL could mistake someone in the future. + +Signed-off-by: Martin Kletzander +Reviewed-by: Pavel Hrdina +(cherry picked from commit 3a39cfacc36b26be559ab6217fce2a44a2b15159) + +Resolves: https://issues.redhat.com/browse/RHEL-80155 + +Signed-off-by: Martin Kletzander +--- + src/qemu/qemu_tpm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c +index cdbd6e3993..2e5ec823b2 100644 +--- a/src/qemu/qemu_tpm.c ++++ b/src/qemu/qemu_tpm.c +@@ -852,7 +852,7 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm, + virCommandAddArgFormat(cmd, "type=unixio,path=%s,mode=0600", + tpm->data.emulator.source->data.nix.path); + +- qemuTPMVirCommandSwtpmAddTPMState(cmd, &tpm->data.emulator, persistentTPMDef, cfg); ++ qemuTPMVirCommandSwtpmAddTPMState(cmd, &tpm->data.emulator, tpm, cfg); + + virCommandAddArg(cmd, "--log"); + if (tpm->data.emulator.debug != 0) +-- +2.50.1 diff --git a/libvirt.spec b/libvirt.spec index 1055414..ac8006f 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -289,7 +289,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 11.5.0 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1 URL: https://libvirt.org/ @@ -313,6 +313,7 @@ Patch13: libvirt-tests-virnettls-test-Drop-use-of-GNUTLS_KEY_KEY_ENCIPHERMENT.pa Patch14: libvirt-qemu_tpm-Rename-qemuTPMHasSharedStorage-qemuTPMDomainHasSharedStorage.patch Patch15: libvirt-qemu_tpm-Extract-per-TPM-functionality-from-qemuTPMDomainHasSharedStorage.patch Patch16: libvirt-qemu_tpm-Only-warn-about-missing-locking-feature-on-shared-filesystems.patch +Patch17: libvirt-qemu_tpm-Do-not-use-persistent-definition-during-pre-start-checks.patch Requires: libvirt-daemon = %{version}-%{release} @@ -1176,6 +1177,9 @@ MinGW Windows libvirt virtualization library. %prep %autosetup -S git_am -N +%autopatch + + %build %if 0%{?fedora} >= %{min_fedora} || 0%{?rhel} >= %{min_rhel} %define supported_platform 1 @@ -2705,6 +2709,9 @@ exit 0 %endif %changelog +* Fri Jul 25 2025 Jiri Denemark - 11.5.0-3 +- qemu_tpm: Do not use persistent definition during pre-start checks (RHEL-80155) + * Fri Jul 18 2025 Jiri Denemark - 11.5.0-2 - virSystemdCreateMachine: Document @maxthreds (RHEL-95361) - cgroup: Unexport 'virDomainCgroupInitCgroup' (RHEL-95361)