lkml.org 
[lkml]   [2008]   [Sep]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/40] KVM: Consolidate XX_VECTOR defines
    Date
    From: Jan Kiszka <jan.kiszka@web.de>

    Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    ---
    arch/x86/kvm/svm.c | 4 ----
    arch/x86/kvm/vmx.c | 2 +-
    include/asm-x86/kvm_host.h | 1 +
    3 files changed, 2 insertions(+), 5 deletions(-)

    diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
    index 54b0bf3..743c98d 100644
    --- a/arch/x86/kvm/svm.c
    +++ b/arch/x86/kvm/svm.c
    @@ -36,10 +36,6 @@ MODULE_LICENSE("GPL");
    #define IOPM_ALLOC_ORDER 2
    #define MSRPM_ALLOC_ORDER 1

    -#define DB_VECTOR 1
    -#define UD_VECTOR 6
    -#define GP_VECTOR 13
    -
    #define DR7_GD_MASK (1 << 13)
    #define DR6_BD_MASK (1 << 13)

    diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
    index 9591ca7..5c9dac5 100644
    --- a/arch/x86/kvm/vmx.c
    +++ b/arch/x86/kvm/vmx.c
    @@ -470,7 +470,7 @@ static void update_exception_bitmap(struct kvm_vcpu *vcpu)
    if (!vcpu->fpu_active)
    eb |= 1u << NM_VECTOR;
    if (vcpu->guest_debug.enabled)
    - eb |= 1u << 1;
    + eb |= 1u << DB_VECTOR;
    if (vcpu->arch.rmode.active)
    eb = ~0;
    if (vm_need_ept())
    diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h
    index af1c0f7..2446893 100644
    --- a/include/asm-x86/kvm_host.h
    +++ b/include/asm-x86/kvm_host.h
    @@ -57,6 +57,7 @@
    #define KVM_PAGES_PER_HPAGE (KVM_HPAGE_SIZE / PAGE_SIZE)

    #define DE_VECTOR 0
    +#define DB_VECTOR 1
    #define UD_VECTOR 6
    #define NM_VECTOR 7
    #define DF_VECTOR 8
    --
    1.6.0.1


    \
     
     \ /
      Last update: 2008-09-23 15:59    [W:0.023 / U:31.796 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site