From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Vrabel Subject: [PATCH 1/4] trace: rename trace_hypercall() to __trace_hypercall_entry() Date: Wed, 3 Oct 2012 17:32:24 +0100 Message-ID: <1349281947-5009-2-git-send-email-david.vrabel@citrix.com> References: <1349281947-5009-1-git-send-email-david.vrabel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1349281947-5009-1-git-send-email-david.vrabel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: David Vrabel , George Dunlap List-Id: xen-devel@lists.xenproject.org From: David Vrabel Tracing functions that don't check tb_init_done are (by convention) prefixed with __. Signed-off-by: David Vrabel --- xen/arch/x86/trace.c | 2 +- xen/arch/x86/x86_64/compat/entry.S | 4 ++-- xen/arch/x86/x86_64/entry.S | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/trace.c b/xen/arch/x86/trace.c index 27fe150..da4e974 100644 --- a/xen/arch/x86/trace.c +++ b/xen/arch/x86/trace.c @@ -6,7 +6,7 @@ #include #include -void trace_hypercall(void) +void __trace_hypercall_entry(void) { struct cpu_user_regs *regs = guest_cpu_user_regs(); diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 2f606ab..e6b52f3 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -59,8 +59,8 @@ UNLIKELY_END(msi_check) #endif cmpb $0,tb_init_done(%rip) UNLIKELY_START(ne, compat_trace) - call trace_hypercall - /* Now restore all the registers that trace_hypercall clobbered */ + call __trace_hypercall_entry + /* Restore the registers that __trace_hypercall_entry clobbered. */ movl UREGS_rax+SHADOW_BYTES(%rsp),%eax /* Hypercall # */ movl UREGS_rbx+SHADOW_BYTES(%rsp),%edi /* Arg 1 */ movl UREGS_rcx+SHADOW_BYTES(%rsp),%esi /* Arg 2 */ diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 74a4075..ffb9314 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -159,8 +159,8 @@ ENTRY(syscall_enter) #endif cmpb $0,tb_init_done(%rip) UNLIKELY_START(ne, trace) - call trace_hypercall - /* Now restore all the registers that trace_hypercall clobbered */ + call __trace_hypercall_entry + /* Restore the registers that __trace_hypercall_entry clobbered. */ movq UREGS_rax+SHADOW_BYTES(%rsp),%rax /* Hypercall # */ movq UREGS_rdi+SHADOW_BYTES(%rsp),%rdi /* Arg 1 */ movq UREGS_rsi+SHADOW_BYTES(%rsp),%rsi /* Arg 2 */ -- 1.7.2.5