Skip to contentSkip to conversation

Consolidate XX_VECTOR defines

PATCH Applied Jan Kiszka 1 participant 1 message Jul 13, 2008

Subsystems (3)
x86 KVM KVM x86
lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/2 Consolidate XX_VECTOR defines

Signed-off-by Jan Kiszka <[email protected]>
---
 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(-)
arch/x86/kvm/svm.c +0 -4
Index: 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)
include/asm-x86/kvm_host.h +1 -0
Index: b/include/asm-x86/kvm_host.h
===================================================================
@@ -56,6 +56,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
arch/x86/kvm/vmx.c +1 -1
Index: b/arch/x86/kvm/vmx.c
===================================================================
@@ -470,7 +470,7 @@ static void update_exception_bitmap(stru
 	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())