Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29c39f38 authored by Stefan Raspl's avatar Stefan Raspl Committed by Radim Krčmář
Browse files

tools/kvm_stat: handle guest removals more gracefully 



When running with the DebugFS provider, removal of a guest can result in a
negative CurAvg/s, which looks rather confusing.
If so, suppress the body refresh and print a message instead.
To reproduce, have at least one guest A completely booted. Then start
another guest B (which generates a huge amount of events), then destroy B.
On the next refresh, kvm_stat should display a whole lot of negative values
in the CurAvg/s column.

Signed-off-by: default avatarStefan Raspl <raspl@linux.ibm.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 0db8b310

tools/kvm/kvm_stat/kvm_stat

+9 −2
Original line number Diff line number Diff line
@@ -1194,6 +1194,7 @@ class Tui(object): 
        # print events

        tavg = 0

        tcur = 0

        guest_removed = False

        for key, values in get_sorted_events(self, stats):

            if row >= self.screen.getmaxyx()[0] - 1 or values == (0, 0):

                break
@@ -1201,7 +1202,10 @@ class Tui(object): 
                key = self.get_gname_from_pid(key)

                if not key:

                    continue

            cur = int(round(values.delta / sleeptime)) if values.delta else ''

            cur = int(round(values.delta / sleeptime)) if values.delta else 0

            if cur < 0:

                guest_removed = True

                continue

            if key[0] != ' ':

                if values.delta:

                    tcur += values.delta
@@ -1214,6 +1218,9 @@ class Tui(object): 
                               values.value * 100 / float(ltotal), cur))

            row += 1

        if row == 3:

            if guest_removed:

                self.screen.addstr(4, 1, 'Guest removed, updating...')

            else:

                self.screen.addstr(4, 1, 'No matching events reported yet')

        if row > 4:

            tavg = int(round(tcur / sleeptime)) if tcur > 0 else ''