lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v5 08/12] KVM: introduce KVM_HVA_ERR_BAD
    Then, remove bad_hva and inline kvm_is_error_hva

    Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
    ---
    include/linux/kvm_host.h | 8 +++++++-
    virt/kvm/kvm_main.c | 13 +------------
    2 files changed, 8 insertions(+), 13 deletions(-)

    diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
    index 8306f24..7737e45 100644
    --- a/include/linux/kvm_host.h
    +++ b/include/linux/kvm_host.h
    @@ -77,6 +77,13 @@ static inline bool is_invalid_pfn(pfn_t pfn)
    return !is_noslot_pfn(pfn) && is_error_pfn(pfn);
    }

    +#define KVM_HVA_ERR_BAD (PAGE_OFFSET)
    +
    +static inline bool kvm_is_error_hva(unsigned long addr)
    +{
    + return addr == PAGE_OFFSET;
    +}
    +
    #define KVM_ERR_PTR_BAD_PAGE (ERR_PTR(-ENOENT))

    static inline bool is_error_page(struct page *page)
    @@ -425,7 +432,6 @@ id_to_memslot(struct kvm_memslots *slots, int id)
    return slot;
    }

    -int kvm_is_error_hva(unsigned long addr);
    int kvm_set_memory_region(struct kvm *kvm,
    struct kvm_userspace_memory_region *mem,
    int user_alloc);
    diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
    index bf6dede..1bd83a6 100644
    --- a/virt/kvm/kvm_main.c
    +++ b/virt/kvm/kvm_main.c
    @@ -931,17 +931,6 @@ void kvm_disable_largepages(void)
    }
    EXPORT_SYMBOL_GPL(kvm_disable_largepages);

    -static inline unsigned long bad_hva(void)
    -{
    - return PAGE_OFFSET;
    -}
    -
    -int kvm_is_error_hva(unsigned long addr)
    -{
    - return addr == bad_hva();
    -}
    -EXPORT_SYMBOL_GPL(kvm_is_error_hva);
    -
    struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn)
    {
    return __gfn_to_memslot(kvm_memslots(kvm), gfn);
    @@ -988,7 +977,7 @@ static unsigned long gfn_to_hva_many(struct kvm_memory_slot *slot, gfn_t gfn,
    gfn_t *nr_pages)
    {
    if (!slot || slot->flags & KVM_MEMSLOT_INVALID)
    - return bad_hva();
    + return KVM_HVA_ERR_BAD;

    if (nr_pages)
    *nr_pages = slot->npages - (gfn - slot->base_gfn);
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-08-07 12:41    [W:4.309 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site