| Message ID | 20240716161015.263031-6-zhao1.liu@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/i386: Misc cleanup on KVM PV defs, outdated comments and error handling | expand |
On 7/16/2024 9:10 AM, Zhao Liu wrote: > 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 | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c > index 64e54beac7b3..4aae4ffc9ccd 100644 > --- a/target/i386/kvm/kvm.c > +++ b/target/i386/kvm/kvm.c > @@ -2728,10 +2728,6 @@ int kvm_arch_init(MachineState *ms, KVMState *s) > > if (enable_cpu_pm) { > 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 |
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 64e54beac7b3..4aae4ffc9ccd 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -2728,10 +2728,6 @@ int kvm_arch_init(MachineState *ms, KVMState *s) if (enable_cpu_pm) { 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 |
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> --- target/i386/kvm/kvm.c | 4 ---- 1 file changed, 4 deletions(-)