diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2008-02-22 12:21:36 -0500 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-04-27 05:00:24 -0400 |
commit | a28e4f5a621289fe0d9c8a461b0c256f9e17f3bc (patch) | |
tree | dfa62426cf55dfb2fad66e924eab34e9840bff12 | |
parent | 308b0f239e8d6754b8b903d279e5b5b987e257ac (diff) |
KVM: add basic paravirt support
Add basic KVM paravirt support. Avoid vm-exits on IO delays.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
-rw-r--r-- | arch/x86/kvm/x86.c | 1 | ||||
-rw-r--r-- | include/asm-x86/kvm_para.h | 3 | ||||
-rw-r--r-- | include/linux/kvm.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 621a8e362fe7..1b9e695cc641 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -820,6 +820,7 @@ int kvm_dev_ioctl_check_extension(long ext) | |||
820 | case KVM_CAP_EXT_CPUID: | 820 | case KVM_CAP_EXT_CPUID: |
821 | case KVM_CAP_CLOCKSOURCE: | 821 | case KVM_CAP_CLOCKSOURCE: |
822 | case KVM_CAP_PIT: | 822 | case KVM_CAP_PIT: |
823 | case KVM_CAP_NOP_IO_DELAY: | ||
823 | r = 1; | 824 | r = 1; |
824 | break; | 825 | break; |
825 | case KVM_CAP_VAPIC: | 826 | case KVM_CAP_VAPIC: |
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 |