}
 }
 
-static bool vgic_update_irq_pending(struct kvm *kvm, int cpuid,
+static int vgic_update_irq_pending(struct kvm *kvm, int cpuid,
                                  unsigned int irq_num, bool level)
 {
        struct vgic_dist *dist = &kvm->arch.vgic;
 out:
        spin_unlock(&dist->lock);
 
-       return ret;
+       return ret ? cpuid : -EINVAL;
 }
 
 /**
 int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int irq_num,
                        bool level)
 {
-       if (likely(vgic_initialized(kvm)) &&
-           vgic_update_irq_pending(kvm, cpuid, irq_num, level))
-               vgic_kick_vcpus(kvm);
+       int vcpu_id;
+
+       if (likely(vgic_initialized(kvm))) {
+               vcpu_id = vgic_update_irq_pending(kvm, cpuid, irq_num, level);
+               if (vcpu_id >= 0)
+                       /* kick the specified vcpu */
+                       kvm_vcpu_kick(kvm_get_vcpu(kvm, vcpu_id));
+       }
 
        return 0;
 }