From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwoER-0002Lv-2G for qemu-devel@nongnu.org; Tue, 17 Jun 2014 03:55:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwoEH-0002Ai-Jf for qemu-devel@nongnu.org; Tue, 17 Jun 2014 03:55:03 -0400 Received: from ozlabs.org ([103.22.144.67]:58905) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwoEH-0002A8-9O for qemu-devel@nongnu.org; Tue, 17 Jun 2014 03:54:53 -0400 From: Michael Ellerman Date: Tue, 17 Jun 2014 17:54:33 +1000 Message-Id: <1402991675-24905-4-git-send-email-mpe@ellerman.id.au> In-Reply-To: <1402991675-24905-1-git-send-email-mpe@ellerman.id.au> References: <1402991675-24905-1-git-send-email-mpe@ellerman.id.au> Subject: [Qemu-devel] [PATCH 4/6] kvm_stat: Fix tracepoint filter definition for s390 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, aik@ozlabs.ru, jan.kiszka@siemens.com, agraf@suse.de, jfrei@linux.vnet.ibm.com, alfs@linux.vnet.ibm.com, pbonzini@redhat.com Although we have the exit_reasons defined for s390, as far as I can tell they never take effect. That is because there is no 'kvm_exit' tracepoint defined for s390. What is defined, for all platforms, is 'kvm_userspace_exit'. That tracepoint uses the generic_exit_reason, but the filter parameter is 'reason'. So invert the way we setup filters, define it by default for the generic tracepoint 'kvm_userspace_exit', and let x86 override it. Doing it this way will also work for powerpc when we add it. Signed-off-by: Michael Ellerman --- scripts/kvm/kvm_stat | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/kvm/kvm_stat b/scripts/kvm/kvm_stat index 98c81a8..2468a22 100755 --- a/scripts/kvm/kvm_stat +++ b/scripts/kvm/kvm_stat @@ -175,18 +175,22 @@ x86_exit_reasons = { } sc_perf_evt_open = None -exit_reasons = None + +filters = { + 'kvm_userspace_exit': ('reason', generic_exit_reasons) +} def x86_init(flag): globals().update({ 'sc_perf_evt_open' : 298, - 'exit_reasons' : x86_exit_reasons[flag], + 'filters' : { + 'kvm_exit': ('exit_reason', x86_exit_reasons[flag]) + }, }) def s390_init(): globals().update({ 'sc_perf_evt_open' : 331, - 'exit_reasons' : generic_exit_reasons, }) def detect_platform(): @@ -204,10 +208,6 @@ def detect_platform(): detect_platform() -filters = { - 'kvm_exit': ('exit_reason', exit_reasons) -} - def invert(d): return dict((x[1], x[0]) for x in d.iteritems()) -- 1.9.1