aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm/arm.c
diff options
context:
space:
mode:
authorAndre Przywara <andre.przywara@arm.com>2014-06-03 03:33:10 -0400
committerChristoffer Dall <christoffer.dall@linaro.org>2015-01-20 12:25:25 -0500
commit59892136c40d6735e627dcea6a056380dfd6721d (patch)
tree1e6f37ba718a4e6d57d6b202fc611f09f7525718 /arch/arm/kvm/arm.c
parent4429fc64b90368e9bc93f933ea8b011d8db3a2f2 (diff)
arm/arm64: KVM: pass down user space provided GIC type into vGIC code
With the introduction of a second emulated GIC model we need to let userspace specify the GIC model to use for each VM. Pass the userspace provided value down into the vGIC code and store it there to differentiate later. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Christoffer Dall <christoffer.dall@linaro.org> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'arch/arm/kvm/arm.c')
-rw-r--r--arch/arm/kvm/arm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index a7b94ecba0d8..3a51ffca75e3 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -851,7 +851,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
851 switch (ioctl) { 851 switch (ioctl) {
852 case KVM_CREATE_IRQCHIP: { 852 case KVM_CREATE_IRQCHIP: {
853 if (vgic_present) 853 if (vgic_present)
854 return kvm_vgic_create(kvm); 854 return kvm_vgic_create(kvm, KVM_DEV_TYPE_ARM_VGIC_V2);
855 else 855 else
856 return -ENXIO; 856 return -ENXIO;
857 } 857 }