Commit bbd5ba8d authored by Bixuan Cui's avatar Bixuan Cui Committed by Anup Patel
Browse files

RISC-V: KVM: fix boolreturn.cocci warnings 



Fix boolreturn.cocci warnings:
./arch/riscv/kvm/mmu.c:603:9-10: WARNING: return of 0/1 in function
'kvm_age_gfn' with return type bool
./arch/riscv/kvm/mmu.c:582:9-10: WARNING: return of 0/1 in function
'kvm_set_spte_gfn' with return type bool
./arch/riscv/kvm/mmu.c:621:9-10: WARNING: return of 0/1 in function
'kvm_test_age_gfn' with return type bool
./arch/riscv/kvm/mmu.c:568:9-10: WARNING: return of 0/1 in function
'kvm_unmap_gfn_range' with return type bool

Signed-off-by: default avatarBixuan Cui <cuibixuan@linux.alibaba.com>
Signed-off-by: default avatarAnup Patel <anup.patel@wdc.com>
parent 7b161d9c

arch/riscv/kvm/mmu.c

+9 −9
Original line number Diff line number Diff line
@@ -565,12 +565,12 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range)

{

	if (!kvm->arch.pgd)

		return 0;

		return false;



	stage2_unmap_range(kvm, range->start << PAGE_SHIFT,

			   (range->end - range->start) << PAGE_SHIFT,

			   range->may_block);

	return 0;

	return false;

}



bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range)
@@ -579,7 +579,7 @@ bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range) 
	kvm_pfn_t pfn = pte_pfn(range->pte);



	if (!kvm->arch.pgd)

		return 0;

		return false;



	WARN_ON(range->end - range->start != 1);
@@ -587,10 +587,10 @@ bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range) 
			      __pfn_to_phys(pfn), PAGE_SIZE, true, true);

	if (ret) {

		kvm_debug("Failed to map stage2 page (error %d)\n", ret);

		return 1;

		return true;

	}



	return 0;

	return false;

}



bool kvm_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range)
@@ -600,13 +600,13 @@ bool kvm_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range) 
	u64 size = (range->end - range->start) << PAGE_SHIFT;



	if (!kvm->arch.pgd)

		return 0;

		return false;



	WARN_ON(size != PAGE_SIZE && size != PMD_SIZE && size != PGDIR_SIZE);



	if (!stage2_get_leaf_entry(kvm, range->start << PAGE_SHIFT,

				   &ptep, &ptep_level))

		return 0;

		return false;



	return ptep_test_and_clear_young(NULL, 0, ptep);

}
@@ -618,13 +618,13 @@ bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range) 
	u64 size = (range->end - range->start) << PAGE_SHIFT;



	if (!kvm->arch.pgd)

		return 0;

		return false;



	WARN_ON(size != PAGE_SIZE && size != PMD_SIZE && size != PGDIR_SIZE);



	if (!stage2_get_leaf_entry(kvm, range->start << PAGE_SHIFT,

				   &ptep, &ptep_level))

		return 0;

		return false;



	return pte_young(*ptep);

}