Skip to content

Commit

Permalink
RISC-V: KVM: fix boolreturn.cocci warnings
Browse files Browse the repository at this point in the history
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: Bixuan Cui <cuibixuan@linux.alibaba.com>
Signed-off-by: Anup Patel <anup.patel@wdc.com>
  • Loading branch information
Bixuan Cui authored and Anup Patel committed Nov 1, 2021
1 parent 7b161d9 commit bbd5ba8
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions arch/riscv/kvm/mmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -579,18 +579,18 @@ 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);

ret = stage2_map_page(kvm, NULL, range->start << PAGE_SHIFT,
__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)
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down

0 comments on commit bbd5ba8

Please sign in to comment.