diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-12-12 07:29:39 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-12-12 07:29:39 +0100 |
| commit | f673b5b2a66332da5358def524dbfb3305c76d8c (patch) | |
| tree | 9f55a133030bb236b7ecc48f776fefc688d243c3 /arch/arm/kvm/arm.c | |
| parent | KVM: x86: Handle the kthread worker using the new API (diff) | |
| parent | arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest (diff) | |
| download | linux-f673b5b2a66332da5358def524dbfb3305c76d8c.tar.xz linux-f673b5b2a66332da5358def524dbfb3305c76d8c.zip | |
Merge tag 'kvm-arm-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM updates for 4.10:
- Support for the GICv3 ITS on 32bit platforms
- A handful of timer and GIC emulation fixes
- A PMU architecture fix
Diffstat (limited to 'arch/arm/kvm/arm.c')
| -rw-r--r-- | arch/arm/kvm/arm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 19b5f5c1c0ff..8f92efa8460e 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -221,6 +221,12 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) case KVM_CAP_MAX_VCPUS: r = KVM_MAX_VCPUS; break; + case KVM_CAP_MSI_DEVID: + if (!kvm) + r = -EINVAL; + else + r = kvm->arch.vgic.msis_require_devid; + break; default: r = kvm_arch_dev_ioctl_check_extension(kvm, ext); break; |