From patchwork Tue Jun 17 07:54:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ellerman X-Patchwork-Id: 4364831 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D125ABEEAA for ; Tue, 17 Jun 2014 07:55:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2311B20279 for ; Tue, 17 Jun 2014 07:55:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FE8B20256 for ; Tue, 17 Jun 2014 07:55:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932386AbaFQHzF (ORCPT ); Tue, 17 Jun 2014 03:55:05 -0400 Received: from ozlabs.org ([103.22.144.67]:38079 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932199AbaFQHyu (ORCPT ); Tue, 17 Jun 2014 03:54:50 -0400 Received: by ozlabs.org (Postfix, from userid 1034) id 79A171400B0; Tue, 17 Jun 2014 17:54:49 +1000 (EST) From: Michael Ellerman To: qemu-devel@nongnu.org Cc: , alfs@linux.vnet.ibm.com, jfrei@linux.vnet.ibm.com, agraf@suse.de, jan.kiszka@siemens.com, pbonzini@redhat.com, aik@ozlabs.ru Subject: [PATCH 4/6] kvm_stat: Fix tracepoint filter definition for s390 Date: Tue, 17 Jun 2014 17:54:33 +1000 Message-Id: <1402991675-24905-4-git-send-email-mpe@ellerman.id.au> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1402991675-24905-1-git-send-email-mpe@ellerman.id.au> References: <1402991675-24905-1-git-send-email-mpe@ellerman.id.au> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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())