svn commit: r254676 - in projects/bhyve_svm/sys/amd64/vmm: . intel

[Peter Grehan]

Author: grehan
Date: Thu Aug 22 22:29:27 2013
New Revision: 254676
URL: http://svnweb.freebsd.org/changeset/base/254676

Log:
  HLT_IGNORED stat is used by both vmx and svm -  move to common stats.
  
  Submitted by:	Anish Gupta (akgupt3 at gmail.com)

Modified:
  projects/bhyve_svm/sys/amd64/vmm/intel/vmx.c
  projects/bhyve_svm/sys/amd64/vmm/vmm_stat.c
  projects/bhyve_svm/sys/amd64/vmm/vmm_stat.h

Modified: projects/bhyve_svm/sys/amd64/vmm/intel/vmx.c
==============================================================================
--- projects/bhyve_svm/sys/amd64/vmm/intel/vmx.c	Thu Aug 22 22:26:46 2013	(r254675)
+++ projects/bhyve_svm/sys/amd64/vmm/intel/vmx.c	Thu Aug 22 22:29:27 2013	(r254676)
@@ -169,9 +169,6 @@ static int cap_pause_exit;
 static int cap_unrestricted_guest;
 static int cap_monitor_trap;
  
-/* statistics */
-static VMM_STAT_INTEL(VMEXIT_HLT_IGNORED, "number of times hlt was ignored");
-
 #ifdef KTR
 static const char *
 exit_reason_to_str(int reason)

Modified: projects/bhyve_svm/sys/amd64/vmm/vmm_stat.c
==============================================================================
--- projects/bhyve_svm/sys/amd64/vmm/vmm_stat.c	Thu Aug 22 22:26:46 2013	(r254675)
+++ projects/bhyve_svm/sys/amd64/vmm/vmm_stat.c	Thu Aug 22 22:29:27 2013	(r254676)
@@ -137,6 +137,7 @@ VMM_STAT(VCPU_MIGRATIONS, "vcpu migratio
 VMM_STAT(VMEXIT_COUNT, "total number of vm exits");
 VMM_STAT(VMEXIT_EXTINT, "vm exits due to external interrupt");
 VMM_STAT(VMEXIT_HLT, "number of times hlt was intercepted");
+VMM_STAT(VMEXIT_HLT_IGNORED, "number of times hlt was ignored");
 VMM_STAT(VMEXIT_CR_ACCESS, "number of times %cr access was intercepted");
 VMM_STAT(VMEXIT_RDMSR, "number of times rdmsr was intercepted");
 VMM_STAT(VMEXIT_WRMSR, "number of times wrmsr was intercepted");

Modified: projects/bhyve_svm/sys/amd64/vmm/vmm_stat.h
==============================================================================
--- projects/bhyve_svm/sys/amd64/vmm/vmm_stat.h	Thu Aug 22 22:26:46 2013	(r254675)
+++ projects/bhyve_svm/sys/amd64/vmm/vmm_stat.h	Thu Aug 22 22:29:27 2013	(r254676)
@@ -107,6 +107,7 @@ VMM_STAT_DECLARE(VCPU_MIGRATIONS);
 VMM_STAT_DECLARE(VMEXIT_COUNT);
 VMM_STAT_DECLARE(VMEXIT_EXTINT);
 VMM_STAT_DECLARE(VMEXIT_HLT);
+VMM_STAT_DECLARE(VMEXIT_HLT_IGNORED);
 VMM_STAT_DECLARE(VMEXIT_CR_ACCESS);
 VMM_STAT_DECLARE(VMEXIT_RDMSR);
 VMM_STAT_DECLARE(VMEXIT_WRMSR);