aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/kvm_para.h3
-rw-r--r--include/linux/kvm.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-x86/kvm_para.h b/include/asm-x86/kvm_para.h
index 5ab7d3dbd357..ed5df3a54aab 100644
--- a/include/asm-x86/kvm_para.h
+++ b/include/asm-x86/kvm_para.h
@@ -10,7 +10,8 @@
10 * paravirtualization, the appropriate feature bit should be checked. 10 * paravirtualization, the appropriate feature bit should be checked.
11 */ 11 */
12#define KVM_CPUID_FEATURES 0x40000001 12#define KVM_CPUID_FEATURES 0x40000001
13#define KVM_FEATURE_CLOCKSOURCE 0 13#define KVM_FEATURE_CLOCKSOURCE 0
14#define KVM_FEATURE_NOP_IO_DELAY 1
14 15
15#define MSR_KVM_WALL_CLOCK 0x11 16#define MSR_KVM_WALL_CLOCK 0x11
16#define MSR_KVM_SYSTEM_TIME 0x12 17#define MSR_KVM_SYSTEM_TIME 0x12
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index a2f3274016ee..76f09474be98 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -237,6 +237,7 @@ struct kvm_vapic_addr {
237#define KVM_CAP_NR_VCPUS 9 /* returns max vcpus per vm */ 237#define KVM_CAP_NR_VCPUS 9 /* returns max vcpus per vm */
238#define KVM_CAP_NR_MEMSLOTS 10 /* returns max memory slots per vm */ 238#define KVM_CAP_NR_MEMSLOTS 10 /* returns max memory slots per vm */
239#define KVM_CAP_PIT 11 239#define KVM_CAP_PIT 11
240#define KVM_CAP_NOP_IO_DELAY 12
240 241
241/* 242/*
242 * ioctls for VM fds 243 * ioctls for VM fds