lkml.org 
[lkml]   [2006]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 37/38] KVM: Move vmx helper inlines to vmx.c
    From
    Date
    Signed-off-by: Avi Kivity <avi@qumranet.com>

    Index: linux-2.6/drivers/kvm/kvm.h
    ===================================================================
    --- linux-2.6.orig/drivers/kvm/kvm.h
    +++ linux-2.6/drivers/kvm/kvm.h
    @@ -400,19 +400,6 @@ static inline int is_paging(struct kvm_v
    return vcpu->cr0 & CR0_PG_MASK;
    }

    -static inline int is_page_fault(u32 intr_info)
    -{
    - return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VECTOR_MASK |
    - INTR_INFO_VALID_MASK)) ==
    - (INTR_TYPE_EXCEPTION | PF_VECTOR | INTR_INFO_VALID_MASK);
    -}
    -
    -static inline int is_external_interrupt(u32 intr_info)
    -{
    - return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK))
    - == (INTR_TYPE_EXT_INTR | INTR_INFO_VALID_MASK);
    -}
    -
    static inline int memslot_id(struct kvm *kvm, struct kvm_memory_slot *slot)
    {
    return slot - kvm->memslots;
    Index: linux-2.6/drivers/kvm/vmx.c
    ===================================================================
    --- linux-2.6.orig/drivers/kvm/vmx.c
    +++ linux-2.6/drivers/kvm/vmx.c
    @@ -77,6 +77,19 @@ static const u32 vmx_msr_index[] = {

    struct vmx_msr_entry *find_msr_entry(struct kvm_vcpu *vcpu, u32 msr);

    +static inline int is_page_fault(u32 intr_info)
    +{
    + return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VECTOR_MASK |
    + INTR_INFO_VALID_MASK)) ==
    + (INTR_TYPE_EXCEPTION | PF_VECTOR | INTR_INFO_VALID_MASK);
    +}
    +
    +static inline int is_external_interrupt(u32 intr_info)
    +{
    + return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK))
    + == (INTR_TYPE_EXT_INTR | INTR_INFO_VALID_MASK);
    +}
    +
    static void vmcs_clear(struct vmcs *vmcs)
    {
    u64 phys_addr = __pa(vmcs);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-11-27 13:51    [from the cache]
    ©2003-2011 Jasper Spaans