KVM: Use common function for VCPU lookup by id

Let's reuse the new common function for VPCU lookup by id.

Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
[split out the new function into a separate patch]

1 files changed, 5 insertions, 7 deletions

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)]);