Commit b74faa93 authored Dec 11, 2017 by Stefan Raspl Committed by Paolo Bonzini Dec 14, 2017

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



Commit 67fbcd62 ("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>

parent 67c162b0

tools/kvm/kvm_stat/kvm_stat

+2 −1

Original line number	Diff line number	Diff line
		@@ -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():

Admin message