lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: Consolidate XX_VECTOR defines

Browse Source 
Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Jan Kiszka
2008-07-13 13:40:55 +02:00
committed by Avi Kivity
parent 7edd0ce058
commit 19bd8afdc4
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kvm/svm.c
View File

@@ -36,10 +36,6 @@ MODULE_LICENSE("GPL");
#define IOPM_ALLOC_ORDER 2 #define IOPM_ALLOC_ORDER 2
#define MSRPM_ALLOC_ORDER 1 #define MSRPM_ALLOC_ORDER 1
#define DB_VECTOR 1
#define UD_VECTOR 6
#define GP_VECTOR 13
#define DR7_GD_MASK (1 << 13) #define DR7_GD_MASK (1 << 13)
#define DR6_BD_MASK (1 << 13) #define DR6_BD_MASK (1 << 13)

2
arch/x86/kvm/vmx.c
View File

@@ -470,7 +470,7 @@ static void update_exception_bitmap(struct kvm_vcpu *vcpu)
if (!vcpu->fpu_active) if (!vcpu->fpu_active)
eb |= 1u << NM_VECTOR; eb |= 1u << NM_VECTOR;
if (vcpu->guest_debug.enabled) if (vcpu->guest_debug.enabled)
eb |= 1u << 1; eb |= 1u << DB_VECTOR;
if (vcpu->arch.rmode.active) if (vcpu->arch.rmode.active)
eb = ~0; eb = ~0;
if (vm_need_ept()) if (vm_need_ept())

1
include/asm-x86/kvm_host.h
View File

@@ -57,6 +57,7 @@
#define KVM_PAGES_PER_HPAGE (KVM_HPAGE_SIZE / PAGE_SIZE) #define KVM_PAGES_PER_HPAGE (KVM_HPAGE_SIZE / PAGE_SIZE)
#define DE_VECTOR 0 #define DE_VECTOR 0
#define DB_VECTOR 1
#define UD_VECTOR 6 #define UD_VECTOR 6
#define NM_VECTOR 7 #define NM_VECTOR 7
#define DF_VECTOR 8 #define DF_VECTOR 8