svn commit: r258476 - head/sys/amd64/vmm

[Neel Natu]

Author: neel
Date: Fri Nov 22 18:57:22 2013
New Revision: 258476
URL: http://svnweb.freebsd.org/changeset/base/258476

Log:
  Eliminate redundant information about the host cpu in bhyve's KTR trace points.
  This is always tracked by ktr(4) and can be displayed using the "-c" option
  of ktrdump(8).
  
  Discussed with:	grehan

Modified:
  head/sys/amd64/vmm/vmm_ktr.h

Modified: head/sys/amd64/vmm/vmm_ktr.h
==============================================================================
--- head/sys/amd64/vmm/vmm_ktr.h	Fri Nov 22 18:54:06 2013	(r258475)
+++ head/sys/amd64/vmm/vmm_ktr.h	Fri Nov 22 18:57:22 2013	(r258476)
@@ -32,32 +32,31 @@
 #include <sys/ktr.h>
 #include <sys/pcpu.h>
 
+#ifndef KTR_VMM
 #define	KTR_VMM	KTR_GEN
+#endif
 
 #define	VCPU_CTR0(vm, vcpuid, format)					\
-CTR3(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu)
+CTR2(KTR_VMM, "vm %s[%d]: " format, vm_name((vm)), (vcpuid))
 
 #define	VCPU_CTR1(vm, vcpuid, format, p1)				\
-CTR4(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu, \
-			(p1))
+CTR3(KTR_VMM, "vm %s[%d]: " format, vm_name((vm)), (vcpuid), (p1))
 
 #define	VCPU_CTR2(vm, vcpuid, format, p1, p2)				\
-CTR5(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu, \
-			(p1), (p2))
+CTR4(KTR_VMM, "vm %s[%d]: " format, vm_name((vm)), (vcpuid), (p1), (p2))
 
 #define	VCPU_CTR3(vm, vcpuid, format, p1, p2, p3)			\
-CTR6(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu, \
-			(p1), (p2), (p3))
+CTR5(KTR_VMM, "vm %s[%d]: " format, vm_name((vm)), (vcpuid), (p1), (p2), (p3))
 
 #define	VM_CTR0(vm, format)						\
-CTR2(KTR_VMM, "vm %s(%d): " format, vm_name((vm)), curcpu)
+CTR1(KTR_VMM, "vm %s: " format, vm_name((vm)))
 
 #define	VM_CTR1(vm, format, p1)						\
-CTR3(KTR_VMM, "vm %s(%d): " format, vm_name((vm)), curcpu, (p1))
+CTR2(KTR_VMM, "vm %s: " format, vm_name((vm)), (p1))
 
 #define	VM_CTR2(vm, format, p1, p2)					\
-CTR4(KTR_VMM, "vm %s(%d): " format, vm_name((vm)), curcpu, (p1), (p2))
+CTR3(KTR_VMM, "vm %s: " format, vm_name((vm)), (p1), (p2))
 
 #define	VM_CTR3(vm, format, p1, p2, p3)					\
-CTR5(KTR_VMM, "vm %s(%d): " format, vm_name((vm)), curcpu, (p1), (p2), (p3))
+CTR4(KTR_VMM, "vm %s: " format, vm_name((vm)), (p1), (p2), (p3))
 #endif