1 files changed, 0 insertions, 89 deletions
diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h
index a71faf727ff..bca63f04dcc 100644
--- a/arch/x86/kvm/trace.h
+++ b/arch/x86/kvm/trace.h
@@ -183,95 +183,6 @@ TRACE_EVENT(kvm_apic,
 #define KVM_ISA_VMX   1
 #define KVM_ISA_SVM   2
-#define VMX_EXIT_REASONS \
-        { EXIT_REASON_EXCEPTION_NMI,            "EXCEPTION_NMI" }, \
-        { EXIT_REASON_EXTERNAL_INTERRUPT,       "EXTERNAL_INTERRUPT" }, \
-        { EXIT_REASON_TRIPLE_FAULT,             "TRIPLE_FAULT" }, \
-        { EXIT_REASON_PENDING_INTERRUPT,        "PENDING_INTERRUPT" }, \
-        { EXIT_REASON_NMI_WINDOW,               "NMI_WINDOW" }, \
-        { EXIT_REASON_TASK_SWITCH,              "TASK_SWITCH" }, \
-        { EXIT_REASON_CPUID,                    "CPUID" }, \
-        { EXIT_REASON_HLT,                      "HLT" }, \
-        { EXIT_REASON_INVLPG,                   "INVLPG" }, \
-        { EXIT_REASON_RDPMC,                    "RDPMC" }, \
-        { EXIT_REASON_RDTSC,                    "RDTSC" }, \
-        { EXIT_REASON_VMCALL,                   "VMCALL" }, \
-        { EXIT_REASON_VMCLEAR,                  "VMCLEAR" }, \
-        { EXIT_REASON_VMLAUNCH,                 "VMLAUNCH" }, \
-        { EXIT_REASON_VMPTRLD,                  "VMPTRLD" }, \
-        { EXIT_REASON_VMPTRST,                  "VMPTRST" }, \
-        { EXIT_REASON_VMREAD,                   "VMREAD" }, \
-        { EXIT_REASON_VMRESUME,                 "VMRESUME" }, \
-        { EXIT_REASON_VMWRITE,                  "VMWRITE" }, \
-        { EXIT_REASON_VMOFF,                    "VMOFF" }, \
-        { EXIT_REASON_VMON,                     "VMON" }, \
-        { EXIT_REASON_CR_ACCESS,                "CR_ACCESS" }, \
-        { EXIT_REASON_DR_ACCESS,                "DR_ACCESS" }, \
-        { EXIT_REASON_IO_INSTRUCTION,           "IO_INSTRUCTION" }, \
-        { EXIT_REASON_MSR_READ,                 "MSR_READ" }, \
-        { EXIT_REASON_MSR_WRITE,                "MSR_WRITE" }, \
-        { EXIT_REASON_MWAIT_INSTRUCTION,        "MWAIT_INSTRUCTION" }, \
-        { EXIT_REASON_MONITOR_INSTRUCTION,      "MONITOR_INSTRUCTION" }, \
-        { EXIT_REASON_PAUSE_INSTRUCTION,        "PAUSE_INSTRUCTION" }, \
-        { EXIT_REASON_MCE_DURING_VMENTRY,       "MCE_DURING_VMENTRY" }, \
-        { EXIT_REASON_TPR_BELOW_THRESHOLD,      "TPR_BELOW_THRESHOLD" },        \
-        { EXIT_REASON_APIC_ACCESS,              "APIC_ACCESS" }, \
-        { EXIT_REASON_EPT_VIOLATION,            "EPT_VIOLATION" }, \
-        { EXIT_REASON_EPT_MISCONFIG,            "EPT_MISCONFIG" }, \
-        { EXIT_REASON_WBINVD,                   "WBINVD" }
-#define SVM_EXIT_REASONS \
-        { SVM_EXIT_READ_CR0,                    "read_cr0" }, \
-        { SVM_EXIT_READ_CR3,                    "read_cr3" }, \
-        { SVM_EXIT_READ_CR4,                    "read_cr4" }, \
-        { SVM_EXIT_READ_CR8,                    "read_cr8" }, \
-        { SVM_EXIT_WRITE_CR0,                   "write_cr0" }, \
-        { SVM_EXIT_WRITE_CR3,                   "write_cr3" }, \
-        { SVM_EXIT_WRITE_CR4,                   "write_cr4" }, \
-        { SVM_EXIT_WRITE_CR8,                   "write_cr8" }, \
-        { SVM_EXIT_READ_DR0,                    "read_dr0" }, \
-        { SVM_EXIT_READ_DR1,                    "read_dr1" }, \
-        { SVM_EXIT_READ_DR2,                    "read_dr2" }, \
-        { SVM_EXIT_READ_DR3,                    "read_dr3" }, \
-        { SVM_EXIT_WRITE_DR0,                   "write_dr0" }, \
-        { SVM_EXIT_WRITE_DR1,                   "write_dr1" }, \
-        { SVM_EXIT_WRITE_DR2,                   "write_dr2" }, \
-        { SVM_EXIT_WRITE_DR3,                   "write_dr3" }, \
-        { SVM_EXIT_WRITE_DR5,                   "write_dr5" }, \
-        { SVM_EXIT_WRITE_DR7,                   "write_dr7" }, \
-        { SVM_EXIT_EXCP_BASE + DB_VECTOR,       "DB excp" }, \
-        { SVM_EXIT_EXCP_BASE + BP_VECTOR,       "BP excp" }, \
-        { SVM_EXIT_EXCP_BASE + UD_VECTOR,       "UD excp" }, \
-        { SVM_EXIT_EXCP_BASE + PF_VECTOR,       "PF excp" }, \
-        { SVM_EXIT_EXCP_BASE + NM_VECTOR,       "NM excp" }, \
-        { SVM_EXIT_EXCP_BASE + MC_VECTOR,       "MC excp" }, \
-        { SVM_EXIT_INTR,                        "interrupt" }, \
-        { SVM_EXIT_NMI,                         "nmi" }, \
-        { SVM_EXIT_SMI,                         "smi" }, \
-        { SVM_EXIT_INIT,                        "init" }, \
-        { SVM_EXIT_VINTR,                       "vintr" }, \
-        { SVM_EXIT_CPUID,                       "cpuid" }, \
-        { SVM_EXIT_INVD,                        "invd" }, \
-        { SVM_EXIT_HLT,                         "hlt" }, \
-        { SVM_EXIT_INVLPG,                      "invlpg" }, \
-        { SVM_EXIT_INVLPGA,                     "invlpga" }, \
-        { SVM_EXIT_IOIO,                        "io" }, \
-        { SVM_EXIT_MSR,                         "msr" }, \
-        { SVM_EXIT_TASK_SWITCH,                 "task_switch" }, \
-        { SVM_EXIT_SHUTDOWN,                    "shutdown" }, \
-        { SVM_EXIT_VMRUN,                       "vmrun" }, \
-        { SVM_EXIT_VMMCALL,                     "hypercall" }, \
-        { SVM_EXIT_VMLOAD,                      "vmload" }, \
-        { SVM_EXIT_VMSAVE,                      "vmsave" }, \
-        { SVM_EXIT_STGI,                        "stgi" }, \
-        { SVM_EXIT_CLGI,                        "clgi" }, \
-        { SVM_EXIT_SKINIT,                      "skinit" }, \
-        { SVM_EXIT_WBINVD,                      "wbinvd" }, \
-        { SVM_EXIT_MONITOR,                     "monitor" }, \
-        { SVM_EXIT_MWAIT,                       "mwait" }, \
-        { SVM_EXIT_XSETBV,                      "xsetbv" }, \
-        { SVM_EXIT_NPF,                         "npf" }
 /*
 * Tracepoint for kvm guest exit:
 */

diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h index a71faf727ff..bca63f04dcc 100644 --- a/arch/x86/kvm/trace.h +++ b/arch/x86/kvm/trace.h
@@ -183,95 +183,6 @@ TRACE_EVENT(kvm_apic,
183	#define KVM_ISA_VMX 1	183	#define KVM_ISA_VMX 1
184	#define KVM_ISA_SVM 2	184	#define KVM_ISA_SVM 2
185		185
186	#define VMX_EXIT_REASONS \
187	{ EXIT_REASON_EXCEPTION_NMI, "EXCEPTION_NMI" }, \
188	{ EXIT_REASON_EXTERNAL_INTERRUPT, "EXTERNAL_INTERRUPT" }, \
189	{ EXIT_REASON_TRIPLE_FAULT, "TRIPLE_FAULT" }, \
190	{ EXIT_REASON_PENDING_INTERRUPT, "PENDING_INTERRUPT" }, \
191	{ EXIT_REASON_NMI_WINDOW, "NMI_WINDOW" }, \
192	{ EXIT_REASON_TASK_SWITCH, "TASK_SWITCH" }, \
193	{ EXIT_REASON_CPUID, "CPUID" }, \
194	{ EXIT_REASON_HLT, "HLT" }, \
195	{ EXIT_REASON_INVLPG, "INVLPG" }, \
196	{ EXIT_REASON_RDPMC, "RDPMC" }, \
197	{ EXIT_REASON_RDTSC, "RDTSC" }, \
198	{ EXIT_REASON_VMCALL, "VMCALL" }, \
199	{ EXIT_REASON_VMCLEAR, "VMCLEAR" }, \
200	{ EXIT_REASON_VMLAUNCH, "VMLAUNCH" }, \
201	{ EXIT_REASON_VMPTRLD, "VMPTRLD" }, \
202	{ EXIT_REASON_VMPTRST, "VMPTRST" }, \
203	{ EXIT_REASON_VMREAD, "VMREAD" }, \
204	{ EXIT_REASON_VMRESUME, "VMRESUME" }, \
205	{ EXIT_REASON_VMWRITE, "VMWRITE" }, \
206	{ EXIT_REASON_VMOFF, "VMOFF" }, \
207	{ EXIT_REASON_VMON, "VMON" }, \
208	{ EXIT_REASON_CR_ACCESS, "CR_ACCESS" }, \
209	{ EXIT_REASON_DR_ACCESS, "DR_ACCESS" }, \
210	{ EXIT_REASON_IO_INSTRUCTION, "IO_INSTRUCTION" }, \
211	{ EXIT_REASON_MSR_READ, "MSR_READ" }, \
212	{ EXIT_REASON_MSR_WRITE, "MSR_WRITE" }, \
213	{ EXIT_REASON_MWAIT_INSTRUCTION, "MWAIT_INSTRUCTION" }, \
214	{ EXIT_REASON_MONITOR_INSTRUCTION, "MONITOR_INSTRUCTION" }, \
215	{ EXIT_REASON_PAUSE_INSTRUCTION, "PAUSE_INSTRUCTION" }, \
216	{ EXIT_REASON_MCE_DURING_VMENTRY, "MCE_DURING_VMENTRY" }, \
217	{ EXIT_REASON_TPR_BELOW_THRESHOLD, "TPR_BELOW_THRESHOLD" }, \
218	{ EXIT_REASON_APIC_ACCESS, "APIC_ACCESS" }, \
219	{ EXIT_REASON_EPT_VIOLATION, "EPT_VIOLATION" }, \
220	{ EXIT_REASON_EPT_MISCONFIG, "EPT_MISCONFIG" }, \
221	{ EXIT_REASON_WBINVD, "WBINVD" }
222
223	#define SVM_EXIT_REASONS \
224	{ SVM_EXIT_READ_CR0, "read_cr0" }, \
225	{ SVM_EXIT_READ_CR3, "read_cr3" }, \
226	{ SVM_EXIT_READ_CR4, "read_cr4" }, \
227	{ SVM_EXIT_READ_CR8, "read_cr8" }, \
228	{ SVM_EXIT_WRITE_CR0, "write_cr0" }, \
229	{ SVM_EXIT_WRITE_CR3, "write_cr3" }, \
230	{ SVM_EXIT_WRITE_CR4, "write_cr4" }, \
231	{ SVM_EXIT_WRITE_CR8, "write_cr8" }, \
232	{ SVM_EXIT_READ_DR0, "read_dr0" }, \
233	{ SVM_EXIT_READ_DR1, "read_dr1" }, \
234	{ SVM_EXIT_READ_DR2, "read_dr2" }, \
235	{ SVM_EXIT_READ_DR3, "read_dr3" }, \
236	{ SVM_EXIT_WRITE_DR0, "write_dr0" }, \
237	{ SVM_EXIT_WRITE_DR1, "write_dr1" }, \
238	{ SVM_EXIT_WRITE_DR2, "write_dr2" }, \
239	{ SVM_EXIT_WRITE_DR3, "write_dr3" }, \
240	{ SVM_EXIT_WRITE_DR5, "write_dr5" }, \
241	{ SVM_EXIT_WRITE_DR7, "write_dr7" }, \
242	{ SVM_EXIT_EXCP_BASE + DB_VECTOR, "DB excp" }, \
243	{ SVM_EXIT_EXCP_BASE + BP_VECTOR, "BP excp" }, \
244	{ SVM_EXIT_EXCP_BASE + UD_VECTOR, "UD excp" }, \
245	{ SVM_EXIT_EXCP_BASE + PF_VECTOR, "PF excp" }, \
246	{ SVM_EXIT_EXCP_BASE + NM_VECTOR, "NM excp" }, \
247	{ SVM_EXIT_EXCP_BASE + MC_VECTOR, "MC excp" }, \
248	{ SVM_EXIT_INTR, "interrupt" }, \
249	{ SVM_EXIT_NMI, "nmi" }, \
250	{ SVM_EXIT_SMI, "smi" }, \
251	{ SVM_EXIT_INIT, "init" }, \
252	{ SVM_EXIT_VINTR, "vintr" }, \
253	{ SVM_EXIT_CPUID, "cpuid" }, \
254	{ SVM_EXIT_INVD, "invd" }, \
255	{ SVM_EXIT_HLT, "hlt" }, \
256	{ SVM_EXIT_INVLPG, "invlpg" }, \
257	{ SVM_EXIT_INVLPGA, "invlpga" }, \
258	{ SVM_EXIT_IOIO, "io" }, \
259	{ SVM_EXIT_MSR, "msr" }, \
260	{ SVM_EXIT_TASK_SWITCH, "task_switch" }, \
261	{ SVM_EXIT_SHUTDOWN, "shutdown" }, \
262	{ SVM_EXIT_VMRUN, "vmrun" }, \
263	{ SVM_EXIT_VMMCALL, "hypercall" }, \
264	{ SVM_EXIT_VMLOAD, "vmload" }, \
265	{ SVM_EXIT_VMSAVE, "vmsave" }, \
266	{ SVM_EXIT_STGI, "stgi" }, \
267	{ SVM_EXIT_CLGI, "clgi" }, \
268	{ SVM_EXIT_SKINIT, "skinit" }, \
269	{ SVM_EXIT_WBINVD, "wbinvd" }, \
270	{ SVM_EXIT_MONITOR, "monitor" }, \
271	{ SVM_EXIT_MWAIT, "mwait" }, \
272	{ SVM_EXIT_XSETBV, "xsetbv" }, \
273	{ SVM_EXIT_NPF, "npf" }
274
275	/*	186	/*
276	* Tracepoint for kvm guest exit:	187	* Tracepoint for kvm guest exit:
277	*/	188	*/