openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tools/kvm_stat: fix extra handling of 'help' with fields filter 

Commit 67fbcd62f5 ("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>
This commit is contained in:
Stefan Raspl 2017-12-11 12:25:22 +01:00 committed by Paolo Bonzini
parent 67c162b089
commit b74faa930d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/kvm/kvm_stat/kvm_stat
View File

@ -478,7 +478,7 @@ class Provider(object):
@staticmethod @staticmethod
def is_field_wanted(fields_filter, field): def is_field_wanted(fields_filter, field):
"""Indicate whether field is valid according to fields_filter.""" """Indicate whether field is valid according to fields_filter."""
if not fields_filter or fields_filter == "help": if not fields_filter:
return True return True
return re.match(fields_filter, field) is not None return re.match(fields_filter, field) is not None
@ -1567,6 +1567,7 @@ def main():
stats = Stats(options) stats = Stats(options)
if options.fields == "help": if options.fields == "help":
stats.fields_filter = None
event_list = "\n" event_list = "\n"
s = stats.get() s = stats.get()
for key in s.keys(): for key in s.keys():