From: Stefan Raspl <stefan.raspl@xxxxxxxxxx>
Sort the fields returned by specifying '-f help' on the command line.
While at it, simplify the code a bit, indent the output and eliminate an
extra blank line at the beginning.
Signed-off-by: Stefan Raspl <raspl@xxxxxxxxxxxxxxxxxx>
---
tools/kvm/kvm_stat/kvm_stat | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/tools/kvm/kvm_stat/kvm_stat b/tools/kvm/kvm_stat/kvm_stat
index 42c34b8818f7..929c8379d82a 100755
--- a/tools/kvm/kvm_stat/kvm_stat
+++ b/tools/kvm/kvm_stat/kvm_stat
@@ -33,6 +33,7 @@ import resource
import struct
import re
import subprocess
+from sets import Set
from collections import defaultdict
VMX_EXIT_REASONS = {
@@ -1572,17 +1573,14 @@ def main():
stats = Stats(options)
- if options.fields == "help":
+ if options.fields == 'help':
stats.fields_filter = None
- event_list = "\n"
- s = stats.get()
- for key in s.keys():
- if key.find('(') != -1:
- key = key[0:key.find('(')]
- if event_list.find('\n' + key + '\n') == -1:
- event_list += key + '\n'
- sys.stdout.write(event_list)
- return ""
+ event_list = []
+ for key in stats.get().keys():
+ event_list.append(key.split('(', 1)[0])
+ event_list.sort()
+ sys.stdout.write(' ' + '\n '.join(sorted(Set(event_list))) + '\n')
+ sys.exit(0)
if options.log:
log(stats)
--
2.13.5
