Support stubdomains

Author: ben-grande

qubesadmin/tools/qvm_top.py

@@ -67,12 +67,12 @@ class Stats:
     Storage qube statistics.
     """
 
-    def __init__(self, vm, state=None) -> None:
+    def __init__(self, vm, state=None, stubdom=False) -> None:
         super().__init__()
         self.state: str = state
         self.vm = vm
         self.name: str = self.vm.name
-        self.klass: str = self.vm.klass
+        self.klass: str = self.vm.klass if not stubdom else ""
         self.memory: int = 0
         self.memory_max: int = 0
         self.memory_usage: float = 0.0
@@ -86,7 +86,10 @@ def update_stats(self, **kwargs) -> None:
         """
         self.memory = int(kwargs["memory_used_kb"]) // 1024
         self.memory_max = int(kwargs["maxmem_kb"]) // 1024
-        self.memory_usage = round(float(kwargs["memory_usage"]), 1)
+        try:
+            self.memory_usage = round(float(kwargs["memory_usage"]), 1)
+        except ValueError:
+            self.memory_usage = "NA"
         self.cpu_time = int(kwargs["cpu_time"]) // 10**9
         if self.klass == "AdminVM":
             self.cpu_usage = round(float(kwargs["cpu_usage_raw"]), 1)
@@ -179,6 +182,8 @@ def update_stats(self, vm, _event, **kwargs) -> None:
         Rpead vm-stats and update qube statistics.
         """
         # pylint: disable=missing-function-docstring
+        if vm.name.endswith("-dm") and vm not in self.entries:
+            self.add_domain_item(submitter=None, vm=vm, event=None)
         if vm not in self.entries:
             return
         self.entries[vm].update_stats(**kwargs)
@@ -204,16 +209,21 @@ def add_domain_item(self, submitter, event, vm, **_kwargs) -> None:
         Add qube to the statistics holder.
         """
         # pylint: disable= unused-argument
+        stubdom = False
         try:
             vm = self.app.domains[str(vm)]
         except KeyError:
-            # Qube not present anymore means it was removed in the meantime.
-            return
+            if not vm.name.endswith("-dm"):
+                # Qube not present anymore means it was removed in the meantime.
+                return
+            stubdom = True
         if vm in self.entries:
             return
 
-        state = self.get_state_from_event(event=event, vm=vm, default="Halted")
-        entry = Stats(vm, state=state)
+        state = self.get_state_from_event(
+            event=event, vm=vm, default="Halted", stubdom=stubdom
+        )
+        entry = Stats(vm, state=state, stubdom=stubdom)
         self.entries[vm] = entry
         self.domains.append(vm)
 
@@ -253,7 +263,9 @@ def update_domain_item(self, vm, event, **kwargs) -> None:
             return
         item.update_state(state)
 
-    def get_state_from_event(self, event, vm, default) -> str | None:
+    def get_state_from_event(
+        self, event, vm, default, stubdom=False
+    ) -> str | None:
         """
         Return power state with cheaply, when necessary, check the API.
         """
@@ -262,7 +274,9 @@ def get_state_from_event(self, event, vm, default) -> str | None:
         try:
             state = vm.get_power_state()
         except QubesException:
-            if vm not in self.app.domains:
+            if stubdom:
+                state = "Running"
+            elif vm not in self.app.domains:
                 state = None
         return state