KVM: Use macro to iterate over vcpus.

[christian: remove unused variables on s390]

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

2 files changed, 9 insertions, 16 deletions

diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index 08a9a49481b2..bb8a1b5e41c1 100644
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -68,10 +68,8 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
                         kvm_is_dm_lowest_prio(irq))
                 printk(KERN_INFO "kvm: apic: phys broadcast and lowest prio\n");
 
-        for (i = 0; i < KVM_MAX_VCPUS; i++) {
-                vcpu = kvm->vcpus[i];
-
-                if (!vcpu || !kvm_apic_present(vcpu))
+        kvm_for_each_vcpu(i, vcpu, kvm) {
+                if (!kvm_apic_present(vcpu))
                         continue;
 
                 if (!kvm_apic_match_dest(vcpu, src, irq->shorthand,
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 25e1f9c97b1a..777fe533cfe7 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -738,10 +738,7 @@ static bool make_all_cpus_request(struct kvm *kvm, unsigned int req)
 
         me = get_cpu();
         spin_lock(&kvm->requests_lock);
-        for (i = 0; i < KVM_MAX_VCPUS; ++i) {
-                vcpu = kvm->vcpus[i];
-                if (!vcpu)
-                        continue;
+        kvm_for_each_vcpu(i, vcpu, kvm) {
                 if (test_and_set_bit(req, &vcpu->requests))
                         continue;
                 cpu = vcpu->cpu;
@@ -1718,7 +1715,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;
+        struct kvm_vcpu *vcpu, *v;
 
         vcpu = kvm_arch_vcpu_create(kvm, id);
         if (IS_ERR(vcpu))
@@ -1736,8 +1733,8 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)
                 goto vcpu_destroy;
         }
 
-        for (r = 0; r < atomic_read(&kvm->online_vcpus); r++)
-                if (kvm->vcpus[r]->vcpu_id == id) {
+        kvm_for_each_vcpu(r, v, kvm)
+                if (v->vcpu_id == id) {
                         r = -EEXIST;
                         goto vcpu_destroy;
                 }
@@ -2526,11 +2523,9 @@ static int vcpu_stat_get(void *_offset, u64 *val)
         *val = 0;
         spin_lock(&kvm_lock);
         list_for_each_entry(kvm, &vm_list, vm_list)
-                for (i = 0; i < KVM_MAX_VCPUS; ++i) {
-                        vcpu = kvm->vcpus[i];
-                        if (vcpu)
-                                *val += *(u32 *)((void *)vcpu + offset);
-                }
+                kvm_for_each_vcpu(i, vcpu, kvm)
+                        *val += *(u32 *)((void *)vcpu + offset);
+
         spin_unlock(&kvm_lock);
         return 0;
 }