diff options
-rw-r--r-- | arch/x86/kvm/x86.c | 3 | ||||
-rw-r--r-- | include/linux/kvm.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 256c0fc92b67..955d2eeac964 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -811,6 +811,9 @@ int kvm_dev_ioctl_check_extension(long ext) | |||
811 | case KVM_CAP_VAPIC: | 811 | case KVM_CAP_VAPIC: |
812 | r = !kvm_x86_ops->cpu_has_accelerated_tpr(); | 812 | r = !kvm_x86_ops->cpu_has_accelerated_tpr(); |
813 | break; | 813 | break; |
814 | case KVM_CAP_NR_VCPUS: | ||
815 | r = KVM_MAX_VCPUS; | ||
816 | break; | ||
814 | default: | 817 | default: |
815 | r = 0; | 818 | r = 0; |
816 | break; | 819 | break; |
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 94540b3c6872..deb9c38f98e7 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h | |||
@@ -234,6 +234,7 @@ struct kvm_vapic_addr { | |||
234 | #define KVM_CAP_VAPIC 6 | 234 | #define KVM_CAP_VAPIC 6 |
235 | #define KVM_CAP_EXT_CPUID 7 | 235 | #define KVM_CAP_EXT_CPUID 7 |
236 | #define KVM_CAP_CLOCKSOURCE 8 | 236 | #define KVM_CAP_CLOCKSOURCE 8 |
237 | #define KVM_CAP_NR_VCPUS 9 /* returns max vcpus per vm */ | ||
237 | 238 | ||
238 | /* | 239 | /* |
239 | * ioctls for VM fds | 240 | * ioctls for VM fds |