This allows to use different GIC types from v2. There are no kernels which could advertise KVM_CAP_DEVICE_CTRL without the actual ability to create GIC with it.
Signed-off-by: Pavel Fedin <p.fe...@samsung.com> --- target-arm/kvm.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/target-arm/kvm.c b/target-arm/kvm.c index b278542..22383c5 100644 --- a/target-arm/kvm.c +++ b/target-arm/kvm.c @@ -585,18 +585,10 @@ void kvm_arch_init_irq_routing(KVMState *s) int kvm_arch_irqchip_create(KVMState *s) { - int ret; - /* If we can create the VGIC using the newer device control API, we * let the device do this when it initializes itself, otherwise we * fall back to the old API */ - - ret = kvm_create_device(s, KVM_DEV_TYPE_ARM_VGIC_V2, true); - if (ret == 0) { - return 1; - } - - return 0; + return kvm_check_extension(s, KVM_CAP_DEVICE_CTRL); } int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, -- 1.9.5.msysgit.0