leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/kvm_stat: fix command line option '-g'

Browse Source 
Specifying a guest via '-g foo' always results in an error:
  $ kvm_stat -g foo
  Usage: kvm_stat [options]

  kvm_stat: error: Error while searching for guest "foo", use "-p" to
  specify a pid instead

Reason is that Tui.get_pid_from_gname() is not static, as it is supposed
to be.

Signed-off-by: Stefan Raspl <raspl@linux.vnet.ibm.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Stefan Raspl 2017-12-11 12:25:19 +01:00 committed by Paolo Bonzini
parent 5663d8f9bb
commit 19e8e54f43
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/kvm/kvm_stat/kvm_stat
View File

@ -950,7 +950,8 @@ class Tui(object):
curses.nocbreak()
curses.endwin()
def get_all_gnames(self):
@staticmethod
def get_all_gnames():
"""Returns a list of (pid, gname) tuples of all running guests"""
res = []
try:
@ -963,7 +964,7 @@ class Tui(object):
# perform a sanity check before calling the more expensive
# function to possibly extract the guest name
if ' -name ' in line[1]:
res.append((line[0], self.get_gname_from_pid(line[0])))
res.append((line[0], Tui.get_gname_from_pid(line[0])))
child.stdout.close()
return res
@ -984,7 +985,8 @@ class Tui(object):
except Exception:
self.screen.addstr(row + 1, 2, 'Not available')
def get_pid_from_gname(self, gname):
@staticmethod
def get_pid_from_gname(gname):
"""Fuzzy function to convert guest name to QEMU process pid.
Returns a list of potential pids, can be empty if no match found.
@ -992,7 +994,7 @@ class Tui(object):
"""
pids = []
for line in self.get_all_gnames():
for line in Tui.get_all_gnames():
if gname == line[1]:
pids.append(int(line[0]))