diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2019-06-01 00:49:02 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-06-01 00:49:02 +0200 |
| commit | f8d221d2e0e1572d0d60174c118e3554d1aa79fa (patch) | |
| tree | 1e8fab4978cd5d241d8657c8de9d22278e4b8aed /arch/powerpc/kvm | |
| parent | Merge tag 'kvm-ppc-fixes-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master (diff) | |
| parent | KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID (diff) | |
| download | linux-dev-f8d221d2e0e1572d0d60174c118e3554d1aa79fa.tar.xz linux-dev-f8d221d2e0e1572d0d60174c118e3554d1aa79fa.zip | |
Merge tag 'kvm-s390-master-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master
KVM: s390: Fixes
- fix compilation for !CONFIG_PCI
- fix the output of KVM_CAP_MAX_VCPU_ID
Diffstat (limited to 'arch/powerpc/kvm')
| -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 3393b166817a..aa3a678711be 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -657,6 +657,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) case KVM_CAP_MAX_VCPUS: r = KVM_MAX_VCPUS; break; + case KVM_CAP_MAX_VCPU_ID: + r = KVM_MAX_VCPU_ID; + break; #ifdef CONFIG_PPC_BOOK3S_64 case KVM_CAP_PPC_GET_SMMU_INFO: r = 1; |