aboutsummaryrefslogtreecommitdiff
path: root/virt/kvm/arm/vgic-v3.c
diff options
context:
space:
mode:
authorGravatar Andre Przywara <andre.przywara@arm.com> 2014-10-26 23:17:00 +0000
committerGravatar Christoffer Dall <christoffer.dall@linaro.org> 2015-01-20 18:25:27 +0100
commitea2f83a7de9d0abbd145e37177905aab57fdb835 (patch)
tree4220e1e4b48490923d9d6fd5f1ac1e2d289bb26c /virt/kvm/arm/vgic-v3.c
parentarm/arm64: KVM: introduce per-VM ops (diff)
downloadlinux-ea2f83a7de9d0abbd145e37177905aab57fdb835.tar.gz
linux-ea2f83a7de9d0abbd145e37177905aab57fdb835.tar.bz2
linux-ea2f83a7de9d0abbd145e37177905aab57fdb835.zip
arm/arm64: KVM: move kvm_register_device_ops() into vGIC probing
Currently we unconditionally register the GICv2 emulation device during the host's KVM initialization. Since with GICv3 support we may end up with only v2 or only v3 or both supported, we move the registration into the GIC probing function, where we will later know which combination is valid. 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 'virt/kvm/arm/vgic-v3.c')
-rw-r--r--virt/kvm/arm/vgic-v3.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/virt/kvm/arm/vgic-v3.c b/virt/kvm/arm/vgic-v3.c
index 1c2c8eef0599..d14c75f4a33b 100644
--- a/virt/kvm/arm/vgic-v3.c
+++ b/virt/kvm/arm/vgic-v3.c
@@ -230,6 +230,7 @@ int vgic_v3_probe(struct device_node *vgic_node,
ret = -ENXIO;
goto out;
}
+ kvm_register_device_ops(&kvm_arm_vgic_v2_ops, KVM_DEV_TYPE_ARM_VGIC_V2);
vgic->vcpu_base = vcpu_res.start;
vgic->vctrl_base = NULL;