Commit 52cf891d authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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
parents 9c6eb531 bbd5ba8d

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);

}

arch/riscv/kvm/vcpu.c

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static int kvm_riscv_vcpu_get_reg_config(struct kvm_vcpu *vcpu, 
		break;

	default:

		return -EINVAL;

	};

	}



	if (copy_to_user(uaddr, &reg_val, KVM_REG_SIZE(reg->id)))

		return -EFAULT;
@@ -201,7 +201,7 @@ static int kvm_riscv_vcpu_set_reg_config(struct kvm_vcpu *vcpu, 
		break;

	default:

		return -EINVAL;

	};

	}



	return 0;

}

arch/riscv/kvm/vcpu_exit.c

+3 −3
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static int emulate_store(struct kvm_vcpu *vcpu, struct kvm_run *run, 
		break;

	default:

		return -EOPNOTSUPP;

	};

	}



	/* Update MMIO details in kvm_run struct */

	run->mmio.is_write = true;
@@ -642,7 +642,7 @@ int kvm_riscv_vcpu_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run) 
		break;

	default:

		return -EOPNOTSUPP;

	};

	}



done:

	/* Move to next instruction */
@@ -684,7 +684,7 @@ int kvm_riscv_vcpu_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, 
		break;

	default:

		break;

	};

	}



	/* Print details in-case of error */

	if (ret < 0) {

arch/riscv/kvm/vcpu_sbi.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ int kvm_riscv_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run) 
		/* Return error for unsupported SBI calls */

		cp->a0 = SBI_ERR_NOT_SUPPORTED;

		break;

	};

	}



	if (next_sepc)

		cp->sepc += 4;

arch/riscv/kvm/vcpu_timer.c

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int kvm_riscv_vcpu_get_reg_timer(struct kvm_vcpu *vcpu, 
		break;

	default:

		return -EINVAL;

	};

	}



	if (copy_to_user(uaddr, &reg_val, KVM_REG_SIZE(reg->id)))

		return -EFAULT;
@@ -167,7 +167,7 @@ int kvm_riscv_vcpu_set_reg_timer(struct kvm_vcpu *vcpu, 
	default:

		ret = -EINVAL;

		break;

	};

	}



	return ret;

}