Commit f5c98031 authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Avi Kivity
Browse files

KVM: update gfn_to_hva() to use gfn_to_hva_memslot() 



Marcelo introduced gfn_to_hva_memslot() when he implemented
gfn_to_pfn_memslot(). Let's use this for gfn_to_hva() too.

Note: also remove parentheses next to return as checkpatch said to do.

Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 197717d5

virt/kvm/kvm_main.c

+6 −6
Original line number Diff line number Diff line
@@ -914,6 +914,11 @@ int memslot_id(struct kvm *kvm, gfn_t gfn) 
	return memslot - slots->memslots;

}



static unsigned long gfn_to_hva_memslot(struct kvm_memory_slot *slot, gfn_t gfn)

{

	return slot->userspace_addr + (gfn - slot->base_gfn) * PAGE_SIZE;

}



unsigned long gfn_to_hva(struct kvm *kvm, gfn_t gfn)

{

	struct kvm_memory_slot *slot;
@@ -922,7 +927,7 @@ unsigned long gfn_to_hva(struct kvm *kvm, gfn_t gfn) 
	slot = gfn_to_memslot_unaliased(kvm, gfn);

	if (!slot || slot->flags & KVM_MEMSLOT_INVALID)

		return bad_hva();

	return (slot->userspace_addr + (gfn - slot->base_gfn) * PAGE_SIZE);

	return gfn_to_hva_memslot(slot, gfn);

}

EXPORT_SYMBOL_GPL(gfn_to_hva);
@@ -972,11 +977,6 @@ pfn_t gfn_to_pfn(struct kvm *kvm, gfn_t gfn) 
}

EXPORT_SYMBOL_GPL(gfn_to_pfn);



static unsigned long gfn_to_hva_memslot(struct kvm_memory_slot *slot, gfn_t gfn)

{

	return (slot->userspace_addr + (gfn - slot->base_gfn) * PAGE_SIZE);

}



pfn_t gfn_to_pfn_memslot(struct kvm *kvm,

			 struct kvm_memory_slot *slot, gfn_t gfn)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE