Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

KVM: Change is_mmio_pfn to kvm_is_mmio_pfn, and make it common for all archs

Add a kvm_ prefix to avoid polluting kernel's name space.

Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>

authored by

Xiantao Zhang and committed by
Avi Kivity
c77fb9dc 8a98f664

+10 -8
+2
include/linux/kvm_host.h
··· 288 288 int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu); 289 289 void kvm_vcpu_kick(struct kvm_vcpu *vcpu); 290 290 291 + int kvm_is_mmio_pfn(pfn_t pfn); 292 + 291 293 struct kvm_irq_ack_notifier { 292 294 struct hlist_node link; 293 295 unsigned gsi;
+8 -8
virt/kvm/kvm_main.c
··· 316 316 return likely(n >= 0 && n < KVM_MAX_VCPUS); 317 317 } 318 318 319 - static inline int is_mmio_pfn(pfn_t pfn) 319 + inline int kvm_is_mmio_pfn(pfn_t pfn) 320 320 { 321 321 if (pfn_valid(pfn)) 322 322 return PageReserved(pfn_to_page(pfn)); ··· 994 994 995 995 pfn = ((addr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff; 996 996 up_read(&current->mm->mmap_sem); 997 - BUG_ON(!is_mmio_pfn(pfn)); 997 + BUG_ON(!kvm_is_mmio_pfn(pfn)); 998 998 } else 999 999 pfn = page_to_pfn(page[0]); 1000 1000 ··· 1008 1008 pfn_t pfn; 1009 1009 1010 1010 pfn = gfn_to_pfn(kvm, gfn); 1011 - if (!is_mmio_pfn(pfn)) 1011 + if (!kvm_is_mmio_pfn(pfn)) 1012 1012 return pfn_to_page(pfn); 1013 1013 1014 - WARN_ON(is_mmio_pfn(pfn)); 1014 + WARN_ON(kvm_is_mmio_pfn(pfn)); 1015 1015 1016 1016 get_page(bad_page); 1017 1017 return bad_page; ··· 1027 1027 1028 1028 void kvm_release_pfn_clean(pfn_t pfn) 1029 1029 { 1030 - if (!is_mmio_pfn(pfn)) 1030 + if (!kvm_is_mmio_pfn(pfn)) 1031 1031 put_page(pfn_to_page(pfn)); 1032 1032 } 1033 1033 EXPORT_SYMBOL_GPL(kvm_release_pfn_clean); ··· 1053 1053 1054 1054 void kvm_set_pfn_dirty(pfn_t pfn) 1055 1055 { 1056 - if (!is_mmio_pfn(pfn)) { 1056 + if (!kvm_is_mmio_pfn(pfn)) { 1057 1057 struct page *page = pfn_to_page(pfn); 1058 1058 if (!PageReserved(page)) 1059 1059 SetPageDirty(page); ··· 1063 1063 1064 1064 void kvm_set_pfn_accessed(pfn_t pfn) 1065 1065 { 1066 - if (!is_mmio_pfn(pfn)) 1066 + if (!kvm_is_mmio_pfn(pfn)) 1067 1067 mark_page_accessed(pfn_to_page(pfn)); 1068 1068 } 1069 1069 EXPORT_SYMBOL_GPL(kvm_set_pfn_accessed); 1070 1070 1071 1071 void kvm_get_pfn(pfn_t pfn) 1072 1072 { 1073 - if (!is_mmio_pfn(pfn)) 1073 + if (!kvm_is_mmio_pfn(pfn)) 1074 1074 get_page(pfn_to_page(pfn)); 1075 1075 } 1076 1076 EXPORT_SYMBOL_GPL(kvm_get_pfn);