From: Zhao Liu Date: Wed, 6 Nov 2024 03:07:23 +0000 (+0800) Subject: target/i386/kvm: Drop workaround for KVM_X86_DISABLE_EXITS_HTL typo X-Git-Tag: v10.0.0-rc0~86^2~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5dabc87b51030fc08b76b2401a5566f0b1463b59;p=thirdparty%2Fqemu.git target/i386/kvm: Drop workaround for KVM_X86_DISABLE_EXITS_HTL typo 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 Reviewed-by: Zide Chen Link: https://lore.kernel.org/r/20241106030728.553238-7-zhao1.liu@intel.com Signed-off-by: Paolo Bonzini --- diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 7536a3c9fd..17f23607ed 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -3100,10 +3100,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 |