Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83f09228 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity
Browse files

KVM: inline is_*_pfn functions 



These functions are exported and can not inline, move them
to kvm_host.h to eliminate the overload of function call

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 950e9509

include/linux/kvm_host.h

+16 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/slab.h>

#include <linux/rcupdate.h>

#include <linux/ratelimit.h>

#include <linux/err.h>

#include <asm/signal.h>



#include <linux/kvm.h>
@@ -52,6 +53,21 @@ 
#define KVM_PFN_ERR_HWPOISON	(-EHWPOISON)

#define KVM_PFN_ERR_BAD		(-ENOENT)



static inline int is_error_pfn(pfn_t pfn)

{

	return IS_ERR_VALUE(pfn);

}



static inline int is_noslot_pfn(pfn_t pfn)

{

	return pfn == -ENOENT;

}



static inline int is_invalid_pfn(pfn_t pfn)

{

	return !is_noslot_pfn(pfn) && is_error_pfn(pfn);

}



/*

 * vcpu->requests bit members

 */
@@ -396,9 +412,6 @@ id_to_memslot(struct kvm_memslots *slots, int id) 
extern struct page *bad_page;



int is_error_page(struct page *page);

int is_error_pfn(pfn_t pfn);

int is_noslot_pfn(pfn_t pfn);

int is_invalid_pfn(pfn_t pfn);

int kvm_is_error_hva(unsigned long addr);

int kvm_set_memory_region(struct kvm *kvm,

			  struct kvm_userspace_memory_region *mem,

virt/kvm/kvm_main.c

+0 −18
Original line number Diff line number Diff line
@@ -928,24 +928,6 @@ int is_error_page(struct page *page) 
}

EXPORT_SYMBOL_GPL(is_error_page);



int is_error_pfn(pfn_t pfn)

{

	return IS_ERR_VALUE(pfn);

}

EXPORT_SYMBOL_GPL(is_error_pfn);



int is_noslot_pfn(pfn_t pfn)

{

	return pfn == -ENOENT;

}

EXPORT_SYMBOL_GPL(is_noslot_pfn);



int is_invalid_pfn(pfn_t pfn)

{

	return !is_noslot_pfn(pfn) && is_error_pfn(pfn);

}

EXPORT_SYMBOL_GPL(is_invalid_pfn);



struct page *get_bad_page(void)

{

	return ERR_PTR(-ENOENT);