summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongjiu Geng <gengdongjiu@huawei.com>2018-10-13 00:12:49 +0800
committerMarc Zyngier <marc.zyngier@arm.com>2018-10-18 10:14:03 +0100
commit58bf437ff64eac8aca606e42d7e4623e40b61fa1 (patch)
treef916c878e83b333f671bf291ecad62e094481792
parent375bdd3b5d4f7cf146f0df1488b4671b141dd799 (diff)
downloadlinux-stable-58bf437ff64eac8aca606e42d7e4623e40b61fa1.tar.gz
linux-stable-58bf437ff64eac8aca606e42d7e4623e40b61fa1.tar.bz2
linux-stable-58bf437ff64eac8aca606e42d7e4623e40b61fa1.zip
arm/arm64: KVM: Enable 32 bits kvm vcpu events support
The commit 539aee0edb9f ("KVM: arm64: Share the parts of get/set events useful to 32bit") shares the get/set events helper for arm64 and arm32, but forgot to share the cap extension code. User space will check whether KVM supports vcpu events by checking the KVM_CAP_VCPU_EVENTS extension Acked-by: James Morse <james.morse@arm.com> Reviewed-by : Suzuki K Poulose <suzuki.poulose@arm.com> Signed-off-by: Dongjiu Geng <gengdongjiu@huawei.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-rw-r--r--arch/arm64/kvm/reset.c1
-rw-r--r--virt/kvm/arm/arm.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c
index 337d2fbc2f06..b72a3dd56204 100644
--- a/arch/arm64/kvm/reset.c
+++ b/arch/arm64/kvm/reset.c
@@ -86,7 +86,6 @@ int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext)
break;
case KVM_CAP_SET_GUEST_DEBUG:
case KVM_CAP_VCPU_ATTRIBUTES:
- case KVM_CAP_VCPU_EVENTS:
r = 1;
break;
case KVM_CAP_ARM_VM_IPA_SIZE:
diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
index 7c9d7b51ce89..11b98b2b0486 100644
--- a/virt/kvm/arm/arm.c
+++ b/virt/kvm/arm/arm.c
@@ -213,6 +213,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
case KVM_CAP_READONLY_MEM:
case KVM_CAP_MP_STATE:
case KVM_CAP_IMMEDIATE_EXIT:
+ case KVM_CAP_VCPU_EVENTS:
r = 1;
break;
case KVM_CAP_ARM_SET_DEVICE_ADDR: