Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'kvm-riscv-5.16-2' of https://github.com/kvm-riscv/linux into HEAD

Minor cocci warning fixes:
1) Bool return warning fix
2) Unnedded semicolon warning fix

+17 -17
+9 -9
arch/riscv/kvm/mmu.c
··· 565 565 bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range) 566 566 { 567 567 if (!kvm->arch.pgd) 568 - return 0; 568 + return false; 569 569 570 570 stage2_unmap_range(kvm, range->start << PAGE_SHIFT, 571 571 (range->end - range->start) << PAGE_SHIFT, 572 572 range->may_block); 573 - return 0; 573 + return false; 574 574 } 575 575 576 576 bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range) ··· 579 579 kvm_pfn_t pfn = pte_pfn(range->pte); 580 580 581 581 if (!kvm->arch.pgd) 582 - return 0; 582 + return false; 583 583 584 584 WARN_ON(range->end - range->start != 1); 585 585 ··· 587 587 __pfn_to_phys(pfn), PAGE_SIZE, true, true); 588 588 if (ret) { 589 589 kvm_debug("Failed to map stage2 page (error %d)\n", ret); 590 - return 1; 590 + return true; 591 591 } 592 592 593 - return 0; 593 + return false; 594 594 } 595 595 596 596 bool kvm_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range) ··· 600 600 u64 size = (range->end - range->start) << PAGE_SHIFT; 601 601 602 602 if (!kvm->arch.pgd) 603 - return 0; 603 + return false; 604 604 605 605 WARN_ON(size != PAGE_SIZE && size != PMD_SIZE && size != PGDIR_SIZE); 606 606 607 607 if (!stage2_get_leaf_entry(kvm, range->start << PAGE_SHIFT, 608 608 &ptep, &ptep_level)) 609 - return 0; 609 + return false; 610 610 611 611 return ptep_test_and_clear_young(NULL, 0, ptep); 612 612 } ··· 618 618 u64 size = (range->end - range->start) << PAGE_SHIFT; 619 619 620 620 if (!kvm->arch.pgd) 621 - return 0; 621 + return false; 622 622 623 623 WARN_ON(size != PAGE_SIZE && size != PMD_SIZE && size != PGDIR_SIZE); 624 624 625 625 if (!stage2_get_leaf_entry(kvm, range->start << PAGE_SHIFT, 626 626 &ptep, &ptep_level)) 627 - return 0; 627 + return false; 628 628 629 629 return pte_young(*ptep); 630 630 }
+2 -2
arch/riscv/kvm/vcpu.c
··· 164 164 break; 165 165 default: 166 166 return -EINVAL; 167 - }; 167 + } 168 168 169 169 if (copy_to_user(uaddr, &reg_val, KVM_REG_SIZE(reg->id))) 170 170 return -EFAULT; ··· 201 201 break; 202 202 default: 203 203 return -EINVAL; 204 - }; 204 + } 205 205 206 206 return 0; 207 207 }
+3 -3
arch/riscv/kvm/vcpu_exit.c
··· 394 394 break; 395 395 default: 396 396 return -EOPNOTSUPP; 397 - }; 397 + } 398 398 399 399 /* Update MMIO details in kvm_run struct */ 400 400 run->mmio.is_write = true; ··· 642 642 break; 643 643 default: 644 644 return -EOPNOTSUPP; 645 - }; 645 + } 646 646 647 647 done: 648 648 /* Move to next instruction */ ··· 684 684 break; 685 685 default: 686 686 break; 687 - }; 687 + } 688 688 689 689 /* Print details in-case of error */ 690 690 if (ret < 0) {
+1 -1
arch/riscv/kvm/vcpu_sbi.c
··· 166 166 /* Return error for unsupported SBI calls */ 167 167 cp->a0 = SBI_ERR_NOT_SUPPORTED; 168 168 break; 169 - }; 169 + } 170 170 171 171 if (next_sepc) 172 172 cp->sepc += 4;
+2 -2
arch/riscv/kvm/vcpu_timer.c
··· 120 120 break; 121 121 default: 122 122 return -EINVAL; 123 - }; 123 + } 124 124 125 125 if (copy_to_user(uaddr, &reg_val, KVM_REG_SIZE(reg->id))) 126 126 return -EFAULT; ··· 167 167 default: 168 168 ret = -EINVAL; 169 169 break; 170 - }; 170 + } 171 171 172 172 return ret; 173 173 }