summaryrefslogtreecommitdiff
path: root/tools/kvm
diff options
context:
space:
mode:
authorStefan Raspl <stefan.raspl@de.ibm.com>2017-12-11 14:25:22 +0300
committerPaolo Bonzini <pbonzini@redhat.com>2017-12-14 11:25:43 +0300
commitb74faa930deb2e37ed5caa0abfc687c8c532e946 (patch)
treeb42bceefee4e9297d260b4a4e2b75d2a6a6c88d1 /tools/kvm
parent67c162b0892ac481e47bef06d9c6231ee993843a (diff)
downloadlinux-b74faa930deb2e37ed5caa0abfc687c8c532e946.tar.xz
tools/kvm_stat: fix extra handling of 'help' with fields filter
Commit 67fbcd62f54d ("tools/kvm_stat: add '-f help' to get the available event list") added support for '-f help'. However, the extra handling of 'help' will also take effect when 'help' is specified as a regex in interactive mode via 'f'. This results in display of all events while only those matching this regex should be shown. Signed-off-by: Stefan Raspl <raspl@linux.vnet.ibm.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tools/kvm')
-rwxr-xr-xtools/kvm/kvm_stat/kvm_stat3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/kvm/kvm_stat/kvm_stat b/tools/kvm/kvm_stat/kvm_stat
index f133755fdde2..4faf9f85a00e 100755
--- a/tools/kvm/kvm_stat/kvm_stat
+++ b/tools/kvm/kvm_stat/kvm_stat
@@ -478,7 +478,7 @@ class Provider(object):
@staticmethod
def is_field_wanted(fields_filter, field):
"""Indicate whether field is valid according to fields_filter."""
- if not fields_filter or fields_filter == "help":
+ if not fields_filter:
return True
return re.match(fields_filter, field) is not None
@@ -1567,6 +1567,7 @@ def main():
stats = Stats(options)
if options.fields == "help":
+ stats.fields_filter = None
event_list = "\n"
s = stats.get()
for key in s.keys():