diff --git a/SOURCES/kvm-target-i386-fix-feature-dependency-for-WAITPKG.patch b/SOURCES/kvm-target-i386-fix-feature-dependency-for-WAITPKG.patch new file mode 100644 index 0000000..484a3d5 --- /dev/null +++ b/SOURCES/kvm-target-i386-fix-feature-dependency-for-WAITPKG.patch @@ -0,0 +1,45 @@ +From d26f4a804b173a68cb8d085ec6dca45cf7f72dcb Mon Sep 17 00:00:00 2001 +From: Igor Mammedov +Date: Wed, 8 May 2024 11:10:54 +0200 +Subject: [PATCH] target/i386: fix feature dependency for WAITPKG + +RH-Author: Igor Mammedov +RH-MergeRequest: 438: target/i386: fix feature dependency for WAITPKG +RH-Jira: RHEL-84866 +RH-Acked-by: Ani Sinha +RH-Acked-by: Jon Maloy +RH-Commit: [1/1] 5c774fe64acd0396b1bdca8c5a8d0c3836b42b6a + +JIRA: https://issues.redhat.com/browse/RHEL-84866 + +The VMX feature bit depends on general availability of WAITPKG, +not the other way round. + +Fixes: 33cc88261c3 ("target/i386: add support for VMX_SECONDARY_EXEC_ENABLE_USER_WAIT_PAUSE", 2023-08-28) +Cc: qemu-stable@nongnu.org +Reviewed-by: Zhao Liu +Signed-off-by: Paolo Bonzini +(cherry picked from commit fe01af5d47d4cf7fdf90c54d43f784e5068c8d72) +Signed-off-by: Igor Mammedov +--- + target/i386/cpu.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/target/i386/cpu.c b/target/i386/cpu.c +index 13737cd703..9af105763f 100644 +--- a/target/i386/cpu.c ++++ b/target/i386/cpu.c +@@ -1550,8 +1550,8 @@ static FeatureDep feature_dependencies[] = { + .to = { FEAT_SVM, ~0ull }, + }, + { +- .from = { FEAT_VMX_SECONDARY_CTLS, VMX_SECONDARY_EXEC_ENABLE_USER_WAIT_PAUSE }, +- .to = { FEAT_7_0_ECX, CPUID_7_0_ECX_WAITPKG }, ++ .from = { FEAT_7_0_ECX, CPUID_7_0_ECX_WAITPKG }, ++ .to = { FEAT_VMX_SECONDARY_CTLS, VMX_SECONDARY_EXEC_ENABLE_USER_WAIT_PAUSE }, + }, + }; + +-- +2.48.1 + diff --git a/SPECS/qemu-kvm.spec b/SPECS/qemu-kvm.spec index c1f98a0..b94f418 100644 --- a/SPECS/qemu-kvm.spec +++ b/SPECS/qemu-kvm.spec @@ -149,7 +149,7 @@ Obsoletes: %{name}-block-ssh <= %{epoch}:%{version} \ Summary: QEMU is a machine emulator and virtualizer Name: qemu-kvm Version: 9.0.0 -Release: 10%{?rcrel}%{?dist}%{?cc_suffix}.2 +Release: 10%{?rcrel}%{?dist}%{?cc_suffix}.3 # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped # Epoch 15 used for RHEL 8 # Epoch 17 used for RHEL 9 (due to release versioning offset in RHEL 8.5) @@ -456,6 +456,8 @@ Patch148: kvm-tests-migration-tests-Verify-postcopy-recover-setup-.patch Patch149: kvm-tests-migration-tests-Cover-postcopy-failure-on-reco.patch # For RHEL-73006 - qemu-kvm: vhost: reports error while updating IOTLB entries [rhel-9.5.z] Patch150: kvm-vhost-fail-device-start-if-iotlb-update-fails.patch +# For RHEL-84866 - Live migration after workload update fails with operation failed: guest CPU doesn't match specification: missing features: waitpkg [rhel-9.5.z] +Patch151: kvm-target-i386-fix-feature-dependency-for-WAITPKG.patch %if %{have_clang} BuildRequires: clang @@ -1522,6 +1524,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %endif %changelog +* Mon Mar 31 2025 Jon Maloy - 9.0.0-10.el9_5.3 +- kvm-target-i386-fix-feature-dependency-for-WAITPKG.patch [RHEL-84866] +- Resolves: RHEL-84866 + (Live migration after workload update fails with operation failed: guest CPU doesn't match specification: missing features: waitpkg [rhel-9.5.z]) + * Wed Jan 15 2025 Miroslav Rezanina - 9.0.0-10.el9_5.2 - kvm-vhost-fail-device-start-if-iotlb-update-fails.patch [RHEL-73006] - Resolves: RHEL-73006