RISC-V: KVM: fix boolreturn.cocci warnings
Subsystems (3)
PATCH 1/1 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
--- arch/riscv/kvm/mmu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
arch/riscv/kvm/mmu.c +9 -9
@@ -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); }
Signature · 1 line
1.8.3.1
Quoted 11 lines · Bixuan Cui
Fix
boolreturn.cocciwarnings:
./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
Quoted 1 line
Signed-off-by Bixuan Cui <[email protected]>
Looks good to me.
Applied to riscv_kvm_next, Thanks!
Regards,
Anup
Quoted 85 lines
--- arch/riscv/kvm/mmu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)arch/riscv/kvm/mmu.c +9
-10@@ -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); } --1.8.3.1
--
kvm-riscv mailing list
kvm-riscv at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kvm-riscv