From 83587b771139daf78321c743b7f12082ed1739e6 Mon Sep 17 00:00:00 2001 From: Kaige Fu Date: Thu, 28 Jun 2018 15:56:48 +0800 Subject: [PATCH] HV: Make all trace event prefix consist with TRACE There are two prefix (aka TRC and TRACE) for trace event. This patch make all the trace event prefix consist with TRACE. No functional change. Signed-off-by: Kaige Fu Acked-by: Eddie Dong --- hypervisor/arch/x86/ept.c | 4 ++-- hypervisor/arch/x86/guest/vlapic.c | 6 ++--- hypervisor/arch/x86/guest/vmcall.c | 2 +- hypervisor/arch/x86/guest/vmsr.c | 4 ++-- hypervisor/arch/x86/io.c | 2 +- hypervisor/arch/x86/virq.c | 8 +++---- hypervisor/arch/x86/vmexit.c | 6 ++--- hypervisor/include/debug/trace.h | 36 +++++++++++++++--------------- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/hypervisor/arch/x86/ept.c b/hypervisor/arch/x86/ept.c index ebcebb356..494ee1c23 100644 --- a/hypervisor/arch/x86/ept.c +++ b/hypervisor/arch/x86/ept.c @@ -364,7 +364,7 @@ int ept_violation_vmexit_handler(struct vcpu *vcpu) /* Get the guest physical address */ gpa = exec_vmread64(VMX_GUEST_PHYSICAL_ADDR_FULL); - TRACE_2L(TRC_VMEXIT_EPT_VIOLATION, exit_qual, gpa); + TRACE_2L(TRACE_VMEXIT_EPT_VIOLATION, exit_qual, gpa); /* Adjust IPA appropriately and OR page offset to get full IPA of abort */ @@ -460,7 +460,7 @@ int ept_misconfig_vmexit_handler(__unused struct vcpu *vcpu) ASSERT(status == 0, "EPT Misconfiguration is not handled.\n"); - TRACE_2L(TRC_VMEXIT_EPT_MISCONFIGURATION, 0, 0); + TRACE_2L(TRACE_VMEXIT_EPT_MISCONFIGURATION, 0, 0); return status; } diff --git a/hypervisor/arch/x86/guest/vlapic.c b/hypervisor/arch/x86/guest/vlapic.c index d6795b7b1..8113a7719 100644 --- a/hypervisor/arch/x86/guest/vlapic.c +++ b/hypervisor/arch/x86/guest/vlapic.c @@ -2298,7 +2298,7 @@ int apic_access_vmexit_handler(struct vcpu *vcpu) emulate_instruction(vcpu); } - TRACE_2L(TRC_VMEXIT_APICV_ACCESS, qual, (uint64_t)vlapic); + TRACE_2L(TRACE_VMEXIT_APICV_ACCESS, qual, (uint64_t)vlapic); return 0; } @@ -2326,7 +2326,7 @@ int veoi_vmexit_handler(struct vcpu *vcpu) vioapic_process_eoi(vlapic->vm, vector); } - TRACE_2L(TRC_VMEXIT_APICV_VIRT_EOI, vector, 0); + TRACE_2L(TRACE_VMEXIT_APICV_VIRT_EOI, vector, 0); return 0; } @@ -2389,7 +2389,7 @@ int apic_write_vmexit_handler(struct vcpu *vcpu) break; } - TRACE_2L(TRC_VMEXIT_APICV_WRITE, offset, 0); + TRACE_2L(TRACE_VMEXIT_APICV_WRITE, offset, 0); return handled; } diff --git a/hypervisor/arch/x86/guest/vmcall.c b/hypervisor/arch/x86/guest/vmcall.c index 14bbec020..a7414bb95 100644 --- a/hypervisor/arch/x86/guest/vmcall.c +++ b/hypervisor/arch/x86/guest/vmcall.c @@ -151,7 +151,7 @@ int vmcall_vmexit_handler(struct vcpu *vcpu) out: cur_context->guest_cpu_regs.regs.rax = ret; - TRACE_2L(TRC_VMEXIT_VMCALL, vm->attr.id, hypcall_id); + TRACE_2L(TRACE_VMEXIT_VMCALL, vm->attr.id, hypcall_id); return 0; } diff --git a/hypervisor/arch/x86/guest/vmsr.c b/hypervisor/arch/x86/guest/vmsr.c index b70a2f61c..6d13412a3 100644 --- a/hypervisor/arch/x86/guest/vmsr.c +++ b/hypervisor/arch/x86/guest/vmsr.c @@ -235,7 +235,7 @@ int rdmsr_vmexit_handler(struct vcpu *vcpu) v & 0xffffffff; vcpu->arch_vcpu.contexts[cur_context].guest_cpu_regs.regs.rdx = v >> 32; - TRACE_2L(TRC_VMEXIT_RDMSR, msr, v); + TRACE_2L(TRACE_VMEXIT_RDMSR, msr, v); return 0; } @@ -358,7 +358,7 @@ int wrmsr_vmexit_handler(struct vcpu *vcpu) } } - TRACE_2L(TRC_VMEXIT_WRMSR, msr, v); + TRACE_2L(TRACE_VMEXIT_WRMSR, msr, v); return 0; } diff --git a/hypervisor/arch/x86/io.c b/hypervisor/arch/x86/io.c index 5770ada6a..98227e98b 100644 --- a/hypervisor/arch/x86/io.c +++ b/hypervisor/arch/x86/io.c @@ -70,7 +70,7 @@ int io_instr_vmexit_handler(struct vcpu *vcpu) direction = VM_EXIT_IO_INSTRUCTION_ACCESS_DIRECTION(exit_qual); mask = 0xfffffffful >> (32 - 8 * sz); - TRACE_4I(TRC_VMEXIT_IO_INSTRUCTION, port, direction, sz, + TRACE_4I(TRACE_VMEXIT_IO_INSTRUCTION, port, direction, sz, cur_context_idx); for (handler = vm->arch_vm.io_handler; diff --git a/hypervisor/arch/x86/virq.c b/hypervisor/arch/x86/virq.c index 719dc307b..8ce61fc4e 100644 --- a/hypervisor/arch/x86/virq.c +++ b/hypervisor/arch/x86/virq.c @@ -312,7 +312,7 @@ int interrupt_window_vmexit_handler(struct vcpu *vcpu) { int value32; - TRACE_2L(TRC_VMEXIT_INTERRUPT_WINDOW, 0, 0); + TRACE_2L(TRACE_VMEXIT_INTERRUPT_WINDOW, 0, 0); if (vcpu == NULL) return -1; @@ -355,7 +355,7 @@ int external_interrupt_vmexit_handler(struct vcpu *vcpu) VCPU_RETAIN_RIP(vcpu); - TRACE_2L(TRC_VMEXIT_EXTERNAL_INTERRUPT, ctx.vector, 0); + TRACE_2L(TRACE_VMEXIT_EXTERNAL_INTERRUPT, ctx.vector, 0); return 0; } @@ -492,7 +492,7 @@ int exception_vmexit_handler(struct vcpu *vcpu) int status = 0; if (vcpu == NULL) { - TRACE_4I(TRC_VMEXIT_EXCEPTION_OR_NMI, 0, 0, 0, 0); + TRACE_4I(TRACE_VMEXIT_EXCEPTION_OR_NMI, 0, 0, 0, 0); status = -EINVAL; } @@ -534,7 +534,7 @@ int exception_vmexit_handler(struct vcpu *vcpu) pr_fatal("Exception #MC got from guest!"); } - TRACE_4I(TRC_VMEXIT_EXCEPTION_OR_NMI, + TRACE_4I(TRACE_VMEXIT_EXCEPTION_OR_NMI, exception_vector, int_err_code, 2, 0); return status; diff --git a/hypervisor/arch/x86/vmexit.c b/hypervisor/arch/x86/vmexit.c index 4264be9db..ef3d8ea63 100644 --- a/hypervisor/arch/x86/vmexit.c +++ b/hypervisor/arch/x86/vmexit.c @@ -213,7 +213,7 @@ static int unhandled_vmexit_handler(struct vcpu *vcpu) /* while(1); */ - TRACE_2L(TRC_VMEXIT_UNHANDLED, vcpu->arch_vcpu.exit_reason, 0); + TRACE_2L(TRACE_VMEXIT_UNHANDLED, vcpu->arch_vcpu.exit_reason, 0); return 0; } @@ -229,7 +229,7 @@ int cpuid_vmexit_handler(struct vcpu *vcpu) (uint32_t *)&cur_context->guest_cpu_regs.regs.rcx, (uint32_t *)&cur_context->guest_cpu_regs.regs.rdx); - TRACE_2L(TRC_VMEXIT_CPUID, vcpu->vcpu_id, 0); + TRACE_2L(TRACE_VMEXIT_CPUID, vcpu->vcpu_id, 0); return 0; } @@ -286,7 +286,7 @@ int cr_access_vmexit_handler(struct vcpu *vcpu) return -EINVAL; } - TRACE_2L(TRC_VMEXIT_CR_ACCESS, + TRACE_2L(TRACE_VMEXIT_CR_ACCESS, VM_EXIT_CR_ACCESS_ACCESS_TYPE (vcpu->arch_vcpu.exit_qualification), VM_EXIT_CR_ACCESS_CR_NUM diff --git a/hypervisor/include/debug/trace.h b/hypervisor/include/debug/trace.h index eca76b9f8..edd9b7aed 100644 --- a/hypervisor/include/debug/trace.h +++ b/hypervisor/include/debug/trace.h @@ -20,26 +20,26 @@ #define TRACE_VM_EXIT 0x10 #define TRACE_VM_ENTER 0X11 -#define TRC_VMEXIT_ENTRY 0x10000 +#define TRACE_VMEXIT_ENTRY 0x10000 -#define TRC_VMEXIT_EXCEPTION_OR_NMI (TRC_VMEXIT_ENTRY + 0x00000000) -#define TRC_VMEXIT_EXTERNAL_INTERRUPT (TRC_VMEXIT_ENTRY + 0x00000001) -#define TRC_VMEXIT_INTERRUPT_WINDOW (TRC_VMEXIT_ENTRY + 0x00000002) -#define TRC_VMEXIT_CPUID (TRC_VMEXIT_ENTRY + 0x00000004) -#define TRC_VMEXIT_RDTSC (TRC_VMEXIT_ENTRY + 0x00000010) -#define TRC_VMEXIT_VMCALL (TRC_VMEXIT_ENTRY + 0x00000012) -#define TRC_VMEXIT_CR_ACCESS (TRC_VMEXIT_ENTRY + 0x0000001C) -#define TRC_VMEXIT_IO_INSTRUCTION (TRC_VMEXIT_ENTRY + 0x0000001E) -#define TRC_VMEXIT_RDMSR (TRC_VMEXIT_ENTRY + 0x0000001F) -#define TRC_VMEXIT_WRMSR (TRC_VMEXIT_ENTRY + 0x00000020) -#define TRC_VMEXIT_EPT_VIOLATION (TRC_VMEXIT_ENTRY + 0x00000030) -#define TRC_VMEXIT_EPT_MISCONFIGURATION (TRC_VMEXIT_ENTRY + 0x00000031) -#define TRC_VMEXIT_RDTSCP (TRC_VMEXIT_ENTRY + 0x00000033) -#define TRC_VMEXIT_APICV_WRITE (TRC_VMEXIT_ENTRY + 0x00000038) -#define TRC_VMEXIT_APICV_ACCESS (TRC_VMEXIT_ENTRY + 0x00000039) -#define TRC_VMEXIT_APICV_VIRT_EOI (TRC_VMEXIT_ENTRY + 0x0000003A) +#define TRACE_VMEXIT_EXCEPTION_OR_NMI (TRACE_VMEXIT_ENTRY + 0x00000000) +#define TRACE_VMEXIT_EXTERNAL_INTERRUPT (TRACE_VMEXIT_ENTRY + 0x00000001) +#define TRACE_VMEXIT_INTERRUPT_WINDOW (TRACE_VMEXIT_ENTRY + 0x00000002) +#define TRACE_VMEXIT_CPUID (TRACE_VMEXIT_ENTRY + 0x00000004) +#define TRACE_VMEXIT_RDTSC (TRACE_VMEXIT_ENTRY + 0x00000010) +#define TRACE_VMEXIT_VMCALL (TRACE_VMEXIT_ENTRY + 0x00000012) +#define TRACE_VMEXIT_CR_ACCESS (TRACE_VMEXIT_ENTRY + 0x0000001C) +#define TRACE_VMEXIT_IO_INSTRUCTION (TRACE_VMEXIT_ENTRY + 0x0000001E) +#define TRACE_VMEXIT_RDMSR (TRACE_VMEXIT_ENTRY + 0x0000001F) +#define TRACE_VMEXIT_WRMSR (TRACE_VMEXIT_ENTRY + 0x00000020) +#define TRACE_VMEXIT_EPT_VIOLATION (TRACE_VMEXIT_ENTRY + 0x00000030) +#define TRACE_VMEXIT_EPT_MISCONFIGURATION (TRACE_VMEXIT_ENTRY + 0x00000031) +#define TRACE_VMEXIT_RDTSCP (TRACE_VMEXIT_ENTRY + 0x00000033) +#define TRACE_VMEXIT_APICV_WRITE (TRACE_VMEXIT_ENTRY + 0x00000038) +#define TRACE_VMEXIT_APICV_ACCESS (TRACE_VMEXIT_ENTRY + 0x00000039) +#define TRACE_VMEXIT_APICV_VIRT_EOI (TRACE_VMEXIT_ENTRY + 0x0000003A) -#define TRC_VMEXIT_UNHANDLED 0x20000 +#define TRACE_VMEXIT_UNHANDLED 0x20000 #ifdef HV_DEBUG