scripts/kvm/kvm_stat: Cleanup of Groups class

Introduced separating newlines for readability and removed special
treatment/variable of the group leader. Renamed fmt to read_format.

The group leader's file descriptor will not be turned into a file
object anymore, instead os.read is used to read from the descriptor.

Signed-off-by: Janosch Frank <frankja@linux.vnet.ibm.com>
Message-Id: <1452525484-32309-24-git-send-email-frankja@linux.vnet.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/scripts/kvm/kvm_stat b/scripts/kvm/kvm_stat
index 203873e..91054e5 100755
--- a/scripts/kvm/kvm_stat
+++ b/scripts/kvm/kvm_stat
@@ -341,20 +341,20 @@ PATH_DEBUGFS_KVM = '/sys/kernel/debug/kvm'
 class Group(object):
     def __init__(self, cpu):
         self.events = []
-        self.group_leader = None
         self.cpu = cpu
+
     def add_event(self, name, event_set, tracepoint, tracefilter=None):
         self.events.append(Event(group=self,
                                  name=name, event_set=event_set,
                                  tracepoint=tracepoint,
                                  tracefilter=tracefilter))
-        if len(self.events) == 1:
-            self.file = os.fdopen(self.events[0].fd)
+
     def read(self):
         length = 8 * (1 + len(self.events))
-        fmt = 'xxxxxxxx' + 'q' * len(self.events)
+        read_format = 'xxxxxxxx' + 'q' * len(self.events)
         return dict(zip([event.name for event in self.events],
-                        struct.unpack(fmt, self.file.read(length))))
+                        struct.unpack(read_format,
+                                      os.read(self.events[0].fd, length))))
 
 class Event(object):
     def __init__(self, group, name, event_set, tracepoint, tracefilter=None):