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

Download as
Browse Code ยป

Commit 0ee8dcb87e403397e575674d0e79272b06dea12e

Authored by Xiao Guangrong
Committed by Avi Kivity
1 parent 9f381a61f5
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

KVM: cleanup memslot_id function 

We can get memslot id from memslot->id directly

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

Showing 2 changed files with 5 additions and 18 deletions Side-by-side Diff

include/linux/kvm_host.h
Diff comments   View file @ 0ee8dcb
... ... @@ -365,7 +365,6 @@
365 365 bool *writable);
366 366 pfn_t gfn_to_pfn_memslot(struct kvm *kvm,
367 367 struct kvm_memory_slot *slot, gfn_t gfn);
368   -int memslot_id(struct kvm *kvm, gfn_t gfn);
369 368 void kvm_release_pfn_dirty(pfn_t);
370 369 void kvm_release_pfn_clean(pfn_t pfn);
371 370 void kvm_set_pfn_dirty(pfn_t pfn);
... ... @@ -595,6 +594,11 @@
595 594 {
596 595 account_system_vtime(current);
597 596 current->flags &= ~PF_VCPU;
  597 +}
  598 +
  599 +static inline int memslot_id(struct kvm *kvm, gfn_t gfn)
  600 +{
  601 + return gfn_to_memslot(kvm, gfn)->id;
598 602 }
599 603  
600 604 static inline unsigned long gfn_to_hva_memslot(struct kvm_memory_slot *slot,
... ... @@ -996,23 +996,6 @@
996 996 return size;
997 997 }
998 998  
999   -int memslot_id(struct kvm *kvm, gfn_t gfn)
1000   -{
1001   - int i;
1002   - struct kvm_memslots *slots = kvm_memslots(kvm);
1003   - struct kvm_memory_slot *memslot = NULL;
1004   -
1005   - for (i = 0; i < slots->nmemslots; ++i) {
1006   - memslot = &slots->memslots[i];
1007   -
1008   - if (gfn >= memslot->base_gfn
1009   - && gfn < memslot->base_gfn + memslot->npages)
1010   - break;
1011   - }
1012   -
1013   - return memslot - slots->memslots;
1014   -}
1015   -
1016 999 static unsigned long gfn_to_hva_many(struct kvm_memory_slot *slot, gfn_t gfn,
1017 1000 gfn_t *nr_pages)
1018 1001 {