[kvm-unit-tests,v2,01/16] x86: Drop types.h

Commit Message

Mathias Krause April 13, 2023, 6:42 p.m. UTC

The file types.h never declared any types, only exception vectors which
are partially re-defined in processor.h.

Move the remaining vector definitions to processor.h and remove types.h,
as all users already include processor.h

Signed-off-by: Mathias Krause <[e-mail]>
---
 lib/x86/processor.h |  7 +++++++
 x86/types.h         | 21 ---------------------
 x86/cmpxchg8b.c     |  1 -
 x86/emulator.c      |  1 -
 x86/pmu_pebs.c      |  1 -
 x86/svm.c           |  1 -
 x86/svm_tests.c     |  1 -
 x86/vmx_tests.c     |  1 -
 8 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 x86/types.h

Patch

diff --git a/lib/x86/processor.h b/lib/x86/processor.h
index 6555056e8a13..91a9022ef43c 100644
--- a/lib/x86/processor.h
+++ b/lib/x86/processor.h
@@ -19,16 +19,23 @@ 
 #  define S "4"
 #endif
 
+#define DE_VECTOR 0
 #define DB_VECTOR 1
+#define NMI_VECTOR 2
 #define BP_VECTOR 3
+#define OF_VECTOR 4
+#define BR_VECTOR 5
 #define UD_VECTOR 6
+#define NM_VECTOR 7
 #define DF_VECTOR 8
 #define TS_VECTOR 10
 #define NP_VECTOR 11
 #define SS_VECTOR 12
 #define GP_VECTOR 13
 #define PF_VECTOR 14
+#define MF_VECTOR 16
 #define AC_VECTOR 17
+#define MC_VECTOR 18
 #define CP_VECTOR 21
 
 #define X86_CR0_PE_BIT		(0)
diff --git a/x86/types.h b/x86/types.h
deleted file mode 100644
index 56ce5ececdec..000000000000
--- a/x86/types.h
+++ /dev/null
@@ -1,21 +0,0 @@ 
-#ifndef X86_TYPES_H
-#define X86_TYPES_H
-
-#define DE_VECTOR 0
-#define DB_VECTOR 1
-#define NMI_VECTOR 2
-#define BP_VECTOR 3
-#define OF_VECTOR 4
-#define BR_VECTOR 5
-#define UD_VECTOR 6
-#define NM_VECTOR 7
-#define DF_VECTOR 8
-#define TS_VECTOR 10
-#define NP_VECTOR 11
-#define SS_VECTOR 12
-#define GP_VECTOR 13
-#define PF_VECTOR 14
-#define MF_VECTOR 16
-#define MC_VECTOR 18
-
-#endif
diff --git a/x86/cmpxchg8b.c b/x86/cmpxchg8b.c
index a416f44f2067..8afe629ea257 100644
--- a/x86/cmpxchg8b.c
+++ b/x86/cmpxchg8b.c
@@ -2,7 +2,6 @@ 
 #include "vm.h"
 #include "libcflat.h"
 #include "desc.h"
-#include "types.h"
 #include "processor.h"
 
 static void test_cmpxchg8b(u32 *mem)
diff --git a/x86/emulator.c b/x86/emulator.c
index ad9437403fef..f8bdc26b70ad 100644
--- a/x86/emulator.c
+++ b/x86/emulator.c
@@ -4,7 +4,6 @@ 
 #include "vm.h"
 #include "libcflat.h"
 #include "desc.h"
-#include "types.h"
 #include "processor.h"
 #include "vmalloc.h"
 #include "alloc_page.h"
diff --git a/x86/pmu_pebs.c b/x86/pmu_pebs.c
index 894ae6c784f9..d1a68ca336ab 100644
--- a/x86/pmu_pebs.c
+++ b/x86/pmu_pebs.c
@@ -8,7 +8,6 @@ 
 #include "alloc.h"
 
 #include "vm.h"
-#include "types.h"
 #include "processor.h"
 #include "vmalloc.h"
 #include "alloc_page.h"
diff --git a/x86/svm.c b/x86/svm.c
index ba435b4ac3af..63a84720709d 100644
--- a/x86/svm.c
+++ b/x86/svm.c
@@ -10,7 +10,6 @@ 
 #include "vm.h"
 #include "fwcfg.h"
 #include "smp.h"
-#include "types.h"
 #include "alloc_page.h"
 #include "isr.h"
 #include "apic.h"
diff --git a/x86/svm_tests.c b/x86/svm_tests.c
index 27ce47b4f98e..691ac937288a 100644
--- a/x86/svm_tests.c
+++ b/x86/svm_tests.c
@@ -5,7 +5,6 @@ 
 #include "msr.h"
 #include "vm.h"
 #include "smp.h"
-#include "types.h"
 #include "alloc_page.h"
 #include "isr.h"
 #include "apic.h"
diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c
index 7952ccb932ea..96104ab018d8 100644
--- a/x86/vmx_tests.c
+++ b/x86/vmx_tests.c
@@ -16,7 +16,6 @@ 
 #include "isr.h"
 #include "desc.h"
 #include "apic.h"
-#include "types.h"
 #include "vmalloc.h"
 #include "alloc_page.h"
 #include "smp.h"