diff options
| author | David Hildenbrand <dahi@linux.vnet.ibm.com> | 2015-11-05 09:03:50 +0100 |
|---|---|---|
| committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2015-11-30 12:47:04 +0100 |
| commit | e09fefdeeb517ff653516dea8a882ce001e99237 (patch) | |
| tree | b9cdb7b637b93779ea96f05cfc56fdead30f9b25 /virt | |
| parent | KVM: x86: MMU: Remove unused parameter parent_pte from kvm_mmu_get_page() (diff) | |
| download | linux-e09fefdeeb517ff653516dea8a882ce001e99237.tar.xz linux-e09fefdeeb517ff653516dea8a882ce001e99237.zip | |
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]
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 12 |
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)]); |