Commit 6259d2f8 authored by Zhang Jiaming's avatar Zhang Jiaming Committed by Anup Patel
Browse files

RISC-V: KVM: Fix variable spelling mistake 



There is a spelling mistake in mmu.c and vcpu_exit.c. Fix it.

Signed-off-by: default avatarZhang Jiaming <jiaming@nfschina.com>
Signed-off-by: default avatarAnup Patel <anup@brainfault.org>
parent 9bfd900b

arch/riscv/kvm/mmu.c

+4 −4
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ int kvm_riscv_gstage_map(struct kvm_vcpu *vcpu, 
{

	int ret;

	kvm_pfn_t hfn;

	bool writeable;

	bool writable;

	short vma_pageshift;

	gfn_t gfn = gpa >> PAGE_SHIFT;

	struct vm_area_struct *vma;
@@ -659,7 +659,7 @@ int kvm_riscv_gstage_map(struct kvm_vcpu *vcpu, 


	mmu_seq = kvm->mmu_notifier_seq;



	hfn = gfn_to_pfn_prot(kvm, gfn, is_write, &writeable);

	hfn = gfn_to_pfn_prot(kvm, gfn, is_write, &writable);

	if (hfn == KVM_PFN_ERR_HWPOISON) {

		send_sig_mceerr(BUS_MCEERR_AR, (void __user *)hva,

				vma_pageshift, current);
@@ -673,14 +673,14 @@ int kvm_riscv_gstage_map(struct kvm_vcpu *vcpu, 
	 * for write faults.

	 */

	if (logging && !is_write)

		writeable = false;

		writable = false;



	spin_lock(&kvm->mmu_lock);



	if (mmu_notifier_retry(kvm, mmu_seq))

		goto out_unlock;



	if (writeable) {

	if (writable) {

		kvm_set_pfn_dirty(hfn);

		mark_page_dirty(kvm, gfn);

		ret = gstage_map_page(kvm, pcache, gpa, hfn << PAGE_SHIFT,

arch/riscv/kvm/vcpu_exit.c

+3 −3
Original line number Diff line number Diff line
@@ -417,17 +417,17 @@ static int gstage_page_fault(struct kvm_vcpu *vcpu, struct kvm_run *run, 
{

	struct kvm_memory_slot *memslot;

	unsigned long hva, fault_addr;

	bool writeable;

	bool writable;

	gfn_t gfn;

	int ret;



	fault_addr = (trap->htval << 2) | (trap->stval & 0x3);

	gfn = fault_addr >> PAGE_SHIFT;

	memslot = gfn_to_memslot(vcpu->kvm, gfn);

	hva = gfn_to_hva_memslot_prot(memslot, gfn, &writeable);

	hva = gfn_to_hva_memslot_prot(memslot, gfn, &writable);



	if (kvm_is_error_hva(hva) ||

	    (trap->scause == EXC_STORE_GUEST_PAGE_FAULT && !writeable)) {

	    (trap->scause == EXC_STORE_GUEST_PAGE_FAULT && !writable)) {

		switch (trap->scause) {

		case EXC_LOAD_GUEST_PAGE_FAULT:

			return emulate_load(vcpu, run, fault_addr,