diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-02 15:52:45 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-02 15:52:45 +0300 |
| commit | d6cf98e06ea4c4071596bc28f2a0f21412d5c6dc (patch) | |
| tree | ee0a079fd91314ea0dfbf3b26dde80bf98b1c0b5 /arch/powerpc/kvm/powerpc.c | |
| parent | 4d5140c5799e676f5a8fb805105e8806f2db1902 (diff) | |
| parent | 70aa3961a196ac32baf54032b2051bac9a941118 (diff) | |
| download | linux-d6cf98e06ea4c4071596bc28f2a0f21412d5c6dc.tar.xz | |
Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD
There's nothing much in the way of new features this time; it's mostly
bug fixes, plus Nikunj has implemented support for KVM_CAP_NR_MEMSLOTS.
Diffstat (limited to 'arch/powerpc/kvm/powerpc.c')
| -rw-r--r-- | arch/powerpc/kvm/powerpc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 2e51289610e4..6fd2405c7f4a 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -559,6 +559,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) else r = num_online_cpus(); break; + case KVM_CAP_NR_MEMSLOTS: + r = KVM_USER_MEM_SLOTS; + break; case KVM_CAP_MAX_VCPUS: r = KVM_MAX_VCPUS; break; |