Commit 46808a4c authored by Marc Zyngier's avatar Marc Zyngier Committed by Paolo Bonzini
Browse files

KVM: Use 'unsigned long' as kvm_for_each_vcpu()'s index 



Everywhere we use kvm_for_each_vpcu(), we use an int as the vcpu
index. Unfortunately, we're about to move rework the iterator,
which requires this to be upgrade to an unsigned long.

Let's bite the bullet and repaint all of it in one go.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Message-Id: <20211116160403.4074052-7-maz@kernel.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c5b07754

arch/arm64/kvm/arch_timer.c

+4 −4
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu) 
/* Make the updates of cntvoff for all vtimer contexts atomic */

static void update_vtimer_cntvoff(struct kvm_vcpu *vcpu, u64 cntvoff)

{

	int i;

	unsigned long i;

	struct kvm *kvm = vcpu->kvm;

	struct kvm_vcpu *tmp;
@@ -1189,8 +1189,8 @@ void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) 


static bool timer_irqs_are_valid(struct kvm_vcpu *vcpu)

{

	int vtimer_irq, ptimer_irq;

	int i, ret;

	int vtimer_irq, ptimer_irq, ret;

	unsigned long i;



	vtimer_irq = vcpu_vtimer(vcpu)->irq.irq;

	ret = kvm_vgic_set_owner(vcpu, vtimer_irq, vcpu_vtimer(vcpu));
@@ -1297,7 +1297,7 @@ void kvm_timer_init_vhe(void) 
static void set_timer_irqs(struct kvm *kvm, int vtimer_irq, int ptimer_irq)

{

	struct kvm_vcpu *vcpu;

	int i;

	unsigned long i;



	kvm_for_each_vcpu(i, vcpu, kvm) {

		vcpu_vtimer(vcpu)->irq.irq = vtimer_irq;

arch/arm64/kvm/arm.c

+3 −3
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ bool kvm_arch_intc_initialized(struct kvm *kvm) 


void kvm_arm_halt_guest(struct kvm *kvm)

{

	int i;

	unsigned long i;

	struct kvm_vcpu *vcpu;



	kvm_for_each_vcpu(i, vcpu, kvm)
@@ -641,7 +641,7 @@ void kvm_arm_halt_guest(struct kvm *kvm) 


void kvm_arm_resume_guest(struct kvm *kvm)

{

	int i;

	unsigned long i;

	struct kvm_vcpu *vcpu;



	kvm_for_each_vcpu(i, vcpu, kvm) {
@@ -2027,7 +2027,7 @@ static int finalize_hyp_mode(void) 
struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr)

{

	struct kvm_vcpu *vcpu;

	int i;

	unsigned long i;



	mpidr &= MPIDR_HWID_BITMASK;

	kvm_for_each_vcpu(i, vcpu, kvm) {

arch/arm64/kvm/pmu-emul.c

+1 −1
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ static int kvm_arm_pmu_v3_init(struct kvm_vcpu *vcpu) 
 */

static bool pmu_irq_is_valid(struct kvm *kvm, int irq)

{

	int i;

	unsigned long i;

	struct kvm_vcpu *vcpu;



	kvm_for_each_vcpu(i, vcpu, kvm) {

arch/arm64/kvm/psci.c

+3 −3
Original line number Diff line number Diff line
@@ -121,8 +121,8 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu) 


static unsigned long kvm_psci_vcpu_affinity_info(struct kvm_vcpu *vcpu)

{

	int i, matching_cpus = 0;

	unsigned long mpidr;

	int matching_cpus = 0;

	unsigned long i, mpidr;

	unsigned long target_affinity;

	unsigned long target_affinity_mask;

	unsigned long lowest_affinity_level;
@@ -164,7 +164,7 @@ static unsigned long kvm_psci_vcpu_affinity_info(struct kvm_vcpu *vcpu) 


static void kvm_prepare_system_event(struct kvm_vcpu *vcpu, u32 type)

{

	int i;

	unsigned long i;

	struct kvm_vcpu *tmp;



	/*

arch/arm64/kvm/reset.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static bool vcpu_allowed_register_width(struct kvm_vcpu *vcpu) 
{

	struct kvm_vcpu *tmp;

	bool is32bit;

	int i;

	unsigned long i;



	is32bit = vcpu_has_feature(vcpu, KVM_ARM_VCPU_EL1_32BIT);

	if (!cpus_have_const_cap(ARM64_HAS_32BIT_EL1) && is32bit)