diff options
| author | Janosch Frank <frankja@linux.vnet.ibm.com> | 2016-01-11 16:17:37 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-01-26 15:58:12 +0100 |
| commit | 6fbff649d75137fd808aaab1e78504a786bcdd29 (patch) | |
| tree | 3d3cc27771a23ba20057e54e475c7d4f25e58739 /scripts/kvm | |
| parent | a6ad61f98742b881b0bce77efb5664d461735c6b (diff) | |
| download | qemu-6fbff649d75137fd808aaab1e78504a786bcdd29.tar.gz | |
scripts/kvm/kvm_stat: Cleanup of path variables
Paths to debugfs and trace dirs are now specified globally to remove
redundancies in the code.
Reviewed-by: Jason J. Herne <jjherne@linux.vnet.ibm.com>
Signed-off-by: Janosch Frank <frankja@linux.vnet.ibm.com>
Message-Id: <1452525484-32309-8-git-send-email-frankja@linux.vnet.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'scripts/kvm')
| -rwxr-xr-x | scripts/kvm/kvm_stat | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/kvm/kvm_stat b/scripts/kvm/kvm_stat index d53945ee0c..5ca09f46d8 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) |