s390x/kvm: use kvm_gsi_routing_enabled in flic
authorFei Li <sherrylf@linux.vnet.ibm.com>
Fri, 25 Nov 2016 06:59:07 +0000 (07:59 +0100)
committerCornelia Huck <cornelia.huck@de.ibm.com>
Fri, 20 Jan 2017 08:48:09 +0000 (09:48 +0100)
Let's use kvm_gsi_routing_enabled() to check if kvm supports
KVM_CAP_IRQ_ROUTING in order to avoid a needless ioctl invocation.

Signed-off-by: Fei Li <sherrylf@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
hw/intc/s390_flic_kvm.c

index 21ac2e2dcd8dbaf85404aa76683fb6455d16a899..c313166fbe141ea6fc26b811f4212c2f4e07a28f 100644 (file)
@@ -201,7 +201,7 @@ static int kvm_s390_register_io_adapter(S390FLICState *fs, uint32_t id,
         .addr = (uint64_t)&adapter,
     };
 
-    if (!kvm_check_extension(kvm_state, KVM_CAP_IRQ_ROUTING)) {
+    if (!kvm_gsi_routing_enabled()) {
         /* nothing to do */
         return 0;
     }
@@ -226,7 +226,7 @@ static int kvm_s390_io_adapter_map(S390FLICState *fs, uint32_t id,
     KVMS390FLICState *flic = KVM_S390_FLIC(fs);
     int r;
 
-    if (!kvm_check_extension(kvm_state, KVM_CAP_IRQ_ROUTING)) {
+    if (!kvm_gsi_routing_enabled()) {
         /* nothing to do */
         return 0;
     }