[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 06/11] target/i386/kvm: Drop workaround for KVM_X86_DISABLE_EX
From: |
Zhao Liu |
Subject: |
[PATCH v5 06/11] target/i386/kvm: Drop workaround for KVM_X86_DISABLE_EXITS_HTL typo |
Date: |
Wed, 6 Nov 2024 11:07:23 +0800 |
The KVM_X86_DISABLE_EXITS_HTL typo has been fixed in commit
77d361b13c19 ("linux-headers: Update to kernel mainline commit
b357bf602").
Drop the related workaround.
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Zide Chen <zide.chen@intel.com>
---
target/i386/kvm/kvm.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index b175cd4a4bcb..1fb4bd19fcf7 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -3085,10 +3085,7 @@ static int kvm_vm_set_tss_addr(KVMState *s, uint64_t
tss_base)
static int kvm_vm_enable_disable_exits(KVMState *s)
{
int disable_exits = kvm_check_extension(s, KVM_CAP_X86_DISABLE_EXITS);
-/* Work around for kernel header with a typo. TODO: fix header and drop. */
-#if defined(KVM_X86_DISABLE_EXITS_HTL) && !defined(KVM_X86_DISABLE_EXITS_HLT)
-#define KVM_X86_DISABLE_EXITS_HLT KVM_X86_DISABLE_EXITS_HTL
-#endif
+
if (disable_exits) {
disable_exits &= (KVM_X86_DISABLE_EXITS_MWAIT |
KVM_X86_DISABLE_EXITS_HLT |
--
2.34.1
- [PATCH v5 00/11] i386: miscellaneous cleanup, Zhao Liu, 2024/11/05
- [PATCH v5 01/11 for v9.2?] i386/cpu: Mark avx10_version filtered when prefix is NULL, Zhao Liu, 2024/11/05
- [PATCH v5 03/11] target/i386/kvm: Remove local MSR_KVM_WALL_CLOCK and MSR_KVM_SYSTEM_TIME definitions, Zhao Liu, 2024/11/05
- [PATCH v5 02/11] target/i386/kvm: Add feature bit definitions for KVM CPUID, Zhao Liu, 2024/11/05
- [PATCH v5 06/11] target/i386/kvm: Drop workaround for KVM_X86_DISABLE_EXITS_HTL typo,
Zhao Liu <=
- [PATCH v5 05/11] target/i386/kvm: Save/load MSRs of kvmclock2 (KVM_FEATURE_CLOCKSOURCE2), Zhao Liu, 2024/11/05
- [PATCH v5 04/11] target/i386/kvm: Only save/load kvmclock MSRs when kvmclock enabled, Zhao Liu, 2024/11/05
- [PATCH v5 08/11] target/i386/kvm: Clean up return values of MSR filter related functions, Zhao Liu, 2024/11/05
- [PATCH v5 07/11] target/i386/confidential-guest: Fix comment of x86_confidential_guest_kvm_type(), Zhao Liu, 2024/11/05
- [PATCH v5 09/11] target/i386/kvm: Return -1 when kvm_msr_energy_thread_init() fails, Zhao Liu, 2024/11/05
- [PATCH v5 10/11] target/i386/kvm: Clean up error handling in kvm_arch_init(), Zhao Liu, 2024/11/05
- [PATCH v5 11/11] target/i386/kvm: Replace ARRAY_SIZE(msr_handlers) with KVM_MSR_FILTER_MAX_RANGES, Zhao Liu, 2024/11/05