lkml.org 
[lkml]   [2012]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 5/9] 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: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
    ---
    include/linux/kvm_host.h | 19 ++++++++++++++++---
    virt/kvm/kvm_main.c | 18 ------------------
    2 files changed, 16 insertions(+), 21 deletions(-)

    diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
    index b02203f..98255ce 100644
    --- a/include/linux/kvm_host.h
    +++ b/include/linux/kvm_host.h
    @@ -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_hwpoison_pfn (-EHWPOISON)
    #define kvm_bad_pfn (-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
    */
    @@ -397,9 +413,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,
    diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
    index da16191..51aaba4 100644
    --- a/virt/kvm/kvm_main.c
    +++ b/virt/kvm/kvm_main.c
    @@ -937,24 +937,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);
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-07-29 11:01    [W:4.088 / U:1.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site