提交 2af1acad 编写于 作者: P Peter Maydell 提交者: Paolo Bonzini

target/i386/kvm.c: Handle renaming of KVM_HINTS_DEDICATED

In kernel header commit 633711e8287, the define KVM_HINTS_DEDICATED
was renamed to KVM_HINTS_REALTIME. Work around this compatibility
break by (a) using the new constant name, and (b) defining it
if the headers don't.

Part (b) can be removed once we've updated our copy of the kernel
headers to a version that defines KVM_HINTS_REALTIME.
Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
Message-Id: <20180525132755.21839-5-peter.maydell@linaro.org>
Reviewed-by: NMichael S. Tsirkin <mst@redhat.com>
Acked-by: NPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
上级 f5bba4ca
......@@ -47,6 +47,11 @@
#include "exec/memattrs.h"
#include "trace.h"
/* Work around this kernel header constant changing its name */
#ifndef KVM_HINTS_REALTIME
#define KVM_HINTS_REALTIME KVM_HINTS_DEDICATED
#endif
//#define DEBUG_KVM
#ifdef DEBUG_KVM
......@@ -386,7 +391,7 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,
ret &= ~(1U << KVM_FEATURE_PV_UNHALT);
}
} else if (function == KVM_CPUID_FEATURES && reg == R_EDX) {
ret |= 1U << KVM_HINTS_DEDICATED;
ret |= 1U << KVM_HINTS_REALTIME;
found = 1;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册