From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIeFi-0001kD-4a for qemu-devel@nongnu.org; Mon, 11 Jan 2016 10:19:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIeFg-0001vx-2W for qemu-devel@nongnu.org; Mon, 11 Jan 2016 10:19:26 -0500 Received: from e06smtp06.uk.ibm.com ([195.75.94.102]:59393) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIeFf-0001v1-O2 for qemu-devel@nongnu.org; Mon, 11 Jan 2016 10:19:23 -0500 Received: from localhost by e06smtp06.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 11 Jan 2016 15:19:22 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 767B02190046 for ; Mon, 11 Jan 2016 15:19:06 +0000 (GMT) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u0BFJHFZ5177784 for ; Mon, 11 Jan 2016 15:19:17 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u0BFJHj4018725 for ; Mon, 11 Jan 2016 08:19:17 -0700 From: Janosch Frank Date: Mon, 11 Jan 2016 16:17:42 +0100 Message-Id: <1452525484-32309-13-git-send-email-frankja@linux.vnet.ibm.com> In-Reply-To: <1452525484-32309-1-git-send-email-frankja@linux.vnet.ibm.com> References: <1452525484-32309-1-git-send-email-frankja@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 12/34] scripts/kvm/kvm_stat: Moved DebugfsProvider List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: pbonzini@redhat.com Cc: frankja@linux.vnet.ibm.com, qemu-devel@nongnu.org When it is next to the TracepointProvider less scrolling is needed to change related, surrounding code. Reviewed-by: Jason J. Herne Signed-off-by: Janosch Frank --- scripts/kvm/kvm_stat | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/kvm/kvm_stat b/scripts/kvm/kvm_stat index 98e1ec7..b5422f8 100755 --- a/scripts/kvm/kvm_stat +++ b/scripts/kvm/kvm_stat @@ -23,18 +23,6 @@ import struct import re from collections import defaultdict -class DebugfsProvider(object): - def __init__(self): - self._fields = walkdir(PATH_DEBUGFS_KVM)[2] - def fields(self): - return self._fields - def select(self, fields): - self._fields = fields - def read(self): - def val(key): - return int(file(PATH_DEBUGFS_KVM + '/' + key).read()) - return dict([(key, val(key)) for key in self._fields]) - VMX_EXIT_REASONS = { 'EXCEPTION_NMI': 0, 'EXTERNAL_INTERRUPT': 1, @@ -441,6 +429,18 @@ class TracepointProvider(object): ret[name] += val return ret +class DebugfsProvider(object): + def __init__(self): + self._fields = walkdir(PATH_DEBUGFS_KVM)[2] + def fields(self): + return self._fields + def select(self, fields): + self._fields = fields + def read(self): + def val(key): + return int(file(PATH_DEBUGFS_KVM + '/' + key).read()) + return dict([(key, val(key)) for key in self._fields]) + class Stats: def __init__(self, providers, fields=None): self.providers = providers -- 2.3.0