3 files changed, 10 insertions, 23 deletions

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 54b45b73195f..a29da44cdc6c 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -308,16 +308,10 @@ static void kvmppc_dump_regs(struct kvm_vcpu *vcpu)
 
 static struct kvm_vcpu *kvmppc_find_vcpu(struct kvm *kvm, int id)
 {
-        int r;
-        struct kvm_vcpu *v, *ret = NULL;
+        struct kvm_vcpu *ret;
 
         mutex_lock(&kvm->lock);
-        kvm_for_each_vcpu(r, v, kvm) {
-                if (v->vcpu_id == id) {
-                        ret = v;
-                        break;
-                }
-        }
+        ret = kvm_get_vcpu_by_id(kvm, id);
         mutex_unlock(&kvm->lock);
         return ret;
 }
diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c
index 5fbfb88f8477..05f7de9869a9 100644
--- a/arch/s390/kvm/diag.c
+++ b/arch/s390/kvm/diag.c
@@ -155,10 +155,8 @@ static int __diag_time_slice_end(struct kvm_vcpu *vcpu)
 
 static int __diag_time_slice_end_directed(struct kvm_vcpu *vcpu)
 {
-        struct kvm *kvm = vcpu->kvm;
         struct kvm_vcpu *tcpu;
         int tid;
-        int i;
 
         tid = vcpu->run->s.regs.gprs[(vcpu->arch.sie_block->ipa & 0xf0) >> 4];
         vcpu->stat.diagnose_9c++;
@@ -167,12 +165,9 @@ static int __diag_time_slice_end_directed(struct kvm_vcpu *vcpu)
         if (tid == vcpu->vcpu_id)
                 return 0;
 
-        kvm_for_each_vcpu(i, tcpu, kvm)
-                if (tcpu->vcpu_id == tid) {
-                        kvm_vcpu_yield_to(tcpu);
-                        break;
-                }
-
+        tcpu = kvm_get_vcpu_by_id(vcpu->kvm, tid);
+        if (tcpu)
+                kvm_vcpu_yield_to(tcpu);
         return 0;
 }
 
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 73cbb4120d0b..9649a42ee990 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2257,7 +2257,7 @@ static int create_vcpu_fd(struct kvm_vcpu *vcpu)
 static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)
 {
         int r;
-        struct kvm_vcpu *vcpu, *v;
+        struct kvm_vcpu *vcpu;
 
         if (id >= KVM_MAX_VCPUS)
                 return -EINVAL;
@@ -2281,12 +2281,10 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)
                 r = -EINVAL;
                 goto unlock_vcpu_destroy;
         }
-
-        kvm_for_each_vcpu(r, v, kvm)
-                if (v->vcpu_id == id) {
-                        r = -EEXIST;
-                        goto unlock_vcpu_destroy;
-                }
+        if (kvm_get_vcpu_by_id(kvm, id)) {
+                r = -EEXIST;
+                goto unlock_vcpu_destroy;
+        }
 
         BUG_ON(kvm->vcpus[atomic_read(&kvm->online_vcpus)]);