Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit f5c9803173848864d0c56108b9e102db0bf601de

Authored by Takuya Yoshikawa
Committed by Avi Kivity
1 parent 197717d581

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: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: Avi Kivity <avi@redhat.com>

Showing 1 changed file with 6 additions and 6 deletions Side-by-side Diff

... ... @@ -914,6 +914,11 @@
914 914 return memslot - slots->memslots;
915 915 }
916 916  
  917 +static unsigned long gfn_to_hva_memslot(struct kvm_memory_slot *slot, gfn_t gfn)
  918 +{
  919 + return slot->userspace_addr + (gfn - slot->base_gfn) * PAGE_SIZE;
  920 +}
  921 +
917 922 unsigned long gfn_to_hva(struct kvm *kvm, gfn_t gfn)
918 923 {
919 924 struct kvm_memory_slot *slot;
... ... @@ -922,7 +927,7 @@
922 927 slot = gfn_to_memslot_unaliased(kvm, gfn);
923 928 if (!slot || slot->flags & KVM_MEMSLOT_INVALID)
924 929 return bad_hva();
925   - return (slot->userspace_addr + (gfn - slot->base_gfn) * PAGE_SIZE);
  930 + return gfn_to_hva_memslot(slot, gfn);
926 931 }
927 932 EXPORT_SYMBOL_GPL(gfn_to_hva);
928 933  
... ... @@ -971,11 +976,6 @@
971 976 return hva_to_pfn(kvm, addr);
972 977 }
973 978 EXPORT_SYMBOL_GPL(gfn_to_pfn);
974   -
975   -static unsigned long gfn_to_hva_memslot(struct kvm_memory_slot *slot, gfn_t gfn)
976   -{
977   - return (slot->userspace_addr + (gfn - slot->base_gfn) * PAGE_SIZE);
978   -}
979 979  
980 980 pfn_t gfn_to_pfn_memslot(struct kvm *kvm,
981 981 struct kvm_memory_slot *slot, gfn_t gfn)