From owner-svn-src-projects@FreeBSD.ORG Thu Aug 22 22:29:29 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 02765BD6; Thu, 22 Aug 2013 22:29:29 +0000 (UTC) (envelope-from grehan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CA65A2944; Thu, 22 Aug 2013 22:29:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7MMTSJZ080788; Thu, 22 Aug 2013 22:29:28 GMT (envelope-from grehan@svn.freebsd.org) Received: (from grehan@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7MMTSVw080785; Thu, 22 Aug 2013 22:29:28 GMT (envelope-from grehan@svn.freebsd.org) Message-Id: <201308222229.r7MMTSVw080785@svn.freebsd.org> From: Peter Grehan Date: Thu, 22 Aug 2013 22:29:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254676 - in projects/bhyve_svm/sys/amd64/vmm: . intel X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Aug 2013 22:29:29 -0000 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@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);