From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO3yF-00086r-NO for qemu-devel@nongnu.org; Tue, 26 Jan 2016 08:47:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO3yE-00041p-K2 for qemu-devel@nongnu.org; Tue, 26 Jan 2016 08:47:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60861) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO3yE-00041d-8o for qemu-devel@nongnu.org; Tue, 26 Jan 2016 08:47:46 -0500 From: Paolo Bonzini Date: Tue, 26 Jan 2016 14:46:45 +0100 Message-Id: <1453816041-36362-14-git-send-email-pbonzini@redhat.com> In-Reply-To: <1453816041-36362-1-git-send-email-pbonzini@redhat.com> References: <1453816041-36362-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 13/49] scripts/kvm/kvm_stat: Cleanup of path variables List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Janosch Frank From: Janosch Frank Paths to debugfs and trace dirs are now specified globally to remove redundancies in the code. Reviewed-by: Jason J. Herne Signed-off-by: Janosch Frank Message-Id: <1452525484-32309-8-git-send-email-frankja@linux.vnet.ibm.com> Signed-off-by: Paolo Bonzini --- 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 d53945e..5ca09f4 100755 --- a/scripts/kvm/kvm_stat +++ b/scripts/kvm/kvm_stat @@ -25,15 +25,14 @@ from collections import defaultdict class DebugfsProvider(object): def __init__(self): - self.base = '/sys/kernel/debug/kvm' - self._fields = walkdir(self.base)[2] + 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(self.base + '/' + key).read()) + return int(file(PATH_DEBUGFS_KVM + '/' + key).read()) return dict([(key, val(key)) for key in self._fields]) VMX_EXIT_REASONS = { @@ -328,7 +327,8 @@ def _perf_event_open(attr, pid, cpu, group_fd, flags): PERF_TYPE_TRACEPOINT = 2 PERF_FORMAT_GROUP = 1 << 3 -sys_tracing = '/sys/kernel/debug/tracing' +PATH_DEBUGFS_TRACING = '/sys/kernel/debug/tracing' +PATH_DEBUGFS_KVM = '/sys/kernel/debug/kvm' class Group(object): def __init__(self, cpu): @@ -353,7 +353,7 @@ class Event(object): attr = perf_event_attr() attr.type = PERF_TYPE_TRACEPOINT attr.size = ctypes.sizeof(attr) - id_path = os.path.join(sys_tracing, 'events', event_set, + id_path = os.path.join(PATH_DEBUGFS_TRACING, 'events', event_set, tracepoint, 'id') id = int(file(id_path).read()) attr.config = id @@ -378,7 +378,7 @@ class Event(object): class TracepointProvider(object): def __init__(self): - path = os.path.join(sys_tracing, 'events', 'kvm') + path = os.path.join(PATH_DEBUGFS_TRACING, 'events', 'kvm') fields = walkdir(path)[1] extra = [] for f in fields: @@ -476,7 +476,7 @@ class Stats: if not os.access('/sys/kernel/debug', os.F_OK): print 'Please enable CONFIG_DEBUG_FS in your kernel' sys.exit(1) -if not os.access('/sys/kernel/debug/kvm', os.F_OK): +if not os.access(PATH_DEBUGFS_KVM, os.F_OK): print "Please mount debugfs ('mount -t debugfs debugfs /sys/kernel/debug')" print "and ensure the kvm modules are loaded" sys.exit(1) -- 1.8.3.1