aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@web.de>2008-07-13 07:40:55 -0400
committerAvi Kivity <avi@qumranet.com>2008-10-15 04:15:14 -0400
commit19bd8afdc4e6fbb47e4841f8d771f8cb29916d9f (patch)
tree8b346a4abe1cd8599828df9a80d8fc69c6416c41 /arch
parent7edd0ce05892831c77fa4cebe24a6056d33336d5 (diff)
KVM: Consolidate XX_VECTOR defines
Signed-off-by: Jan Kiszka <jan.kiszka@web.de> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/svm.c4
-rw-r--r--arch/x86/kvm/vmx.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 54b0bf33e21e..743c98d135c4 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -36,10 +36,6 @@ MODULE_LICENSE("GPL");
36#define IOPM_ALLOC_ORDER 2 36#define IOPM_ALLOC_ORDER 2
37#define MSRPM_ALLOC_ORDER 1 37#define MSRPM_ALLOC_ORDER 1
38 38
39#define DB_VECTOR 1
40#define UD_VECTOR 6
41#define GP_VECTOR 13
42
43#define DR7_GD_MASK (1 << 13) 39#define DR7_GD_MASK (1 << 13)
44#define DR6_BD_MASK (1 << 13) 40#define DR6_BD_MASK (1 << 13)
45 41
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 9591ca73191c..5c9dac567a74 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)
470 if (!vcpu->fpu_active) 470 if (!vcpu->fpu_active)
471 eb |= 1u << NM_VECTOR; 471 eb |= 1u << NM_VECTOR;
472 if (vcpu->guest_debug.enabled) 472 if (vcpu->guest_debug.enabled)
473 eb |= 1u << 1; 473 eb |= 1u << DB_VECTOR;
474 if (vcpu->arch.rmode.active) 474 if (vcpu->arch.rmode.active)
475 eb = ~0; 475 eb = ~0;
476 if (vm_need_ept()) 476 if (vm_need_ept())