aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kvm/x86.c3
-rw-r--r--include/linux/kvm.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 955d2eeac964..b7c32f63671d 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -814,6 +814,9 @@ int kvm_dev_ioctl_check_extension(long ext)
814 case KVM_CAP_NR_VCPUS: 814 case KVM_CAP_NR_VCPUS:
815 r = KVM_MAX_VCPUS; 815 r = KVM_MAX_VCPUS;
816 break; 816 break;
817 case KVM_CAP_NR_MEMSLOTS:
818 r = KVM_MEMORY_SLOTS;
819 break;
817 default: 820 default:
818 r = 0; 821 r = 0;
819 break; 822 break;
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index deb9c38f98e7..e92e70324ea1 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -235,6 +235,7 @@ struct kvm_vapic_addr {
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#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 239
239/* 240/*
240 * ioctls for VM fds 241 * ioctls for VM fds