qvm-ls: fix total VM size reporting

There is no vm.storage object in qubesadmin module.
QubesOS · Jul 29, 2017 · 7db2ed8 · 7db2ed8
1 parent 80f1dd7
commit 7db2ed8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/qubesadmin/tools/qvm_ls.py b/qubesadmin/tools/qvm_ls.py
@@ -351,7 +351,7 @@ def calc_used(vm, volume_name):
     doc='Memory currently used by VM')
 
 Column('DISK',
-    attr=(lambda vm: vm.storage.get_disk_utilization() / 1024 / 1024),
+    attr=(lambda vm: vm.get_disk_utilization() // 1024 // 1024),
     doc='Total disk utilisation.')
 
 

diff --git a/qubesadmin/vm/__init__.py b/qubesadmin/vm/__init__.py
@@ -257,6 +257,10 @@ def volumes(self):
                     vm=self.name, vm_name=volname)
         return self._volumes
 
+    def get_disk_utilization(self):
+        '''Get total disk usage of the VM'''
+        return sum(vol.usage for vol in self.volumes.values())
+
     def run_service(self, service, **kwargs):
         '''Run service on this VM