Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 988a2cae authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: Use macro to iterate over vcpus. 



[christian: remove unused variables on s390]

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 73880c80

arch/ia64/kvm/kvm-ia64.c

+14 −15
Original line number Diff line number Diff line
@@ -337,13 +337,12 @@ static struct kvm_vcpu *lid_to_vcpu(struct kvm *kvm, unsigned long id, 
{

	union ia64_lid lid;

	int i;

	struct kvm_vcpu *vcpu;



	for (i = 0; i < atomic_read(&kvm->online_vcpus); i++) {

		if (kvm->vcpus[i]) {

			lid.val = VCPU_LID(kvm->vcpus[i]);

	kvm_for_each_vcpu(i, vcpu, kvm) {

		lid.val = VCPU_LID(vcpu);

		if (lid.id == id && lid.eid == eid)

				return kvm->vcpus[i];

		}

			return vcpu;

	}



	return NULL;
@@ -409,21 +408,21 @@ static int handle_global_purge(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	struct kvm *kvm = vcpu->kvm;

	struct call_data call_data;

	int i;

	struct kvm_vcpu *vcpui;



	call_data.ptc_g_data = p->u.ptc_g_data;



	for (i = 0; i < atomic_read(&kvm->online_vcpus); i++) {

		if (!kvm->vcpus[i] || kvm->vcpus[i]->arch.mp_state ==

						KVM_MP_STATE_UNINITIALIZED ||

					vcpu == kvm->vcpus[i])

	kvm_for_each_vcpu(i, vcpui, kvm) {

		if (vcpui->arch.mp_state == KVM_MP_STATE_UNINITIALIZED ||

				vcpu == vcpui)

			continue;



		if (waitqueue_active(&kvm->vcpus[i]->wq))

			wake_up_interruptible(&kvm->vcpus[i]->wq);

		if (waitqueue_active(&vcpui->wq))

			wake_up_interruptible(&vcpui->wq);



		if (kvm->vcpus[i]->cpu != -1) {

			call_data.vcpu = kvm->vcpus[i];

			smp_call_function_single(kvm->vcpus[i]->cpu,

		if (vcpui->cpu != -1) {

			call_data.vcpu = vcpui;

			smp_call_function_single(vcpui->cpu,

					vcpu_global_purge, &call_data, 1);

		} else

			printk(KERN_WARNING"kvm: Uninit vcpu received ipi!\n");

arch/powerpc/kvm/powerpc.c

+10 −6
Original line number Diff line number Diff line
@@ -122,13 +122,17 @@ struct kvm *kvm_arch_create_vm(void) 
static void kvmppc_free_vcpus(struct kvm *kvm)

{

	unsigned int i;

	struct kvm_vcpu *vcpu;



	kvm_for_each_vcpu(i, vcpu, kvm)

		kvm_arch_vcpu_free(vcpu);



	for (i = 0; i < KVM_MAX_VCPUS; ++i) {

		if (kvm->vcpus[i]) {

			kvm_arch_vcpu_free(kvm->vcpus[i]);

	mutex_lock(&kvm->lock);

	for (i = 0; i < atomic_read(&kvm->online_vcpus); i++)

		kvm->vcpus[i] = NULL;

		}

	}



	atomic_set(&kvm->online_vcpus, 0);

	mutex_unlock(&kvm->lock);

}



void kvm_arch_sync_events(struct kvm *kvm)

arch/s390/kvm/kvm-s390.c

+15 −16
Original line number Diff line number Diff line
@@ -211,13 +211,17 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) 
static void kvm_free_vcpus(struct kvm *kvm)

{

	unsigned int i;

	struct kvm_vcpu *vcpu;



	for (i = 0; i < KVM_MAX_VCPUS; ++i) {

		if (kvm->vcpus[i]) {

			kvm_arch_vcpu_destroy(kvm->vcpus[i]);

	kvm_for_each_vcpu(i, vcpu, kvm)

		kvm_arch_vcpu_destroy(vcpu);



	mutex_lock(&kvm->lock);

	for (i = 0; i < atomic_read(&kvm->online_vcpus); i++)

		kvm->vcpus[i] = NULL;

		}

	}



	atomic_set(&kvm->online_vcpus, 0);

	mutex_unlock(&kvm->lock);

}



void kvm_arch_sync_events(struct kvm *kvm)
@@ -314,8 +318,6 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, 
	BUG_ON(!kvm->arch.sca);

	if (!kvm->arch.sca->cpu[id].sda)

		kvm->arch.sca->cpu[id].sda = (__u64) vcpu->arch.sie_block;

	else

		BUG_ON(!kvm->vcpus[id]); /* vcpu does already exist */

	vcpu->arch.sie_block->scaoh = (__u32)(((__u64)kvm->arch.sca) >> 32);

	vcpu->arch.sie_block->scaol = (__u32)(__u64)kvm->arch.sca;
@@ -683,6 +685,7 @@ int kvm_arch_set_memory_region(struct kvm *kvm, 
				int user_alloc)

{

	int i;

	struct kvm_vcpu *vcpu;



	/* A few sanity checks. We can have exactly one memory slot which has

	   to start at guest virtual zero and which has to be located at a
@@ -707,14 +710,10 @@ int kvm_arch_set_memory_region(struct kvm *kvm, 
		return -EINVAL;



	/* request update of sie control block for all available vcpus */

	for (i = 0; i < KVM_MAX_VCPUS; ++i) {

		if (kvm->vcpus[i]) {

			if (test_and_set_bit(KVM_REQ_MMU_RELOAD,

						&kvm->vcpus[i]->requests))

	kvm_for_each_vcpu(i, vcpu, kvm) {

		if (test_and_set_bit(KVM_REQ_MMU_RELOAD, &vcpu->requests))

			continue;

			kvm_s390_inject_sigp_stop(kvm->vcpus[i],

						  ACTION_RELOADVCPU_ON_STOP);

		}

		kvm_s390_inject_sigp_stop(vcpu, ACTION_RELOADVCPU_ON_STOP);

	}



	return 0;

arch/x86/kvm/i8254.c

+2 −5
Original line number Diff line number Diff line
@@ -669,12 +669,9 @@ static void __inject_pit_timer_intr(struct kvm *kvm) 
	 * VCPU0, and only if its LVT0 is in EXTINT mode.

	 */

	if (kvm->arch.vapics_in_nmi_mode > 0)

		for (i = 0; i < KVM_MAX_VCPUS; ++i) {

			vcpu = kvm->vcpus[i];

			if (vcpu)

		kvm_for_each_vcpu(i, vcpu, kvm)

			kvm_apic_nmi_wd_deliver(vcpu);

}

}



void kvm_inject_pit_timer_irqs(struct kvm_vcpu *vcpu)

{

arch/x86/kvm/mmu.c

+3 −3
Original line number Diff line number Diff line
@@ -1347,10 +1347,10 @@ static void kvm_mmu_put_page(struct kvm_mmu_page *sp, u64 *parent_pte) 
static void kvm_mmu_reset_last_pte_updated(struct kvm *kvm)

{

	int i;

	struct kvm_vcpu *vcpu;



	for (i = 0; i < KVM_MAX_VCPUS; ++i)

		if (kvm->vcpus[i])

			kvm->vcpus[i]->arch.last_pte_updated = NULL;

	kvm_for_each_vcpu(i, vcpu, kvm)

		vcpu->arch.last_pte_updated = NULL;

}



static void kvm_mmu_unlink_parents(struct kvm *kvm, struct kvm_mmu_page *sp)