Do not require Xen to get VM stats

It's not completely Xen agnostic because then it would not be possible
to query stubdomains, as libvirt is not aware of them. On the other
hand, non-Xen has one more API methods working.

When not using Xen, construct the dictionary as "xc.domain_getinfo()"
would, so the info loop can consume from both inputs.

Author: ben-grande

qubes/app.py

@@ -404,12 +404,12 @@ def get_vm_stats(self, previous_time=None, previous=None, only_vm=None):
          - ``cpu_usage_raw`` - CPU usage in %.
          - ``cpu_usage`` - CPU usage in % (normalized to number of vcpus).
 
-        This function requires Xen hypervisor.
+        This function requires Xen hypervisor for detailed overview.
 
         ..warning:
 
            This function may return info about implementation-specific VMs,
-           like stubdomains for HVM
+           like stubdomains for HVM, aggregated to the connected domain.
 
         :param previous: previous measurement
         :param previous_time: time of previous measurement
@@ -428,46 +428,106 @@ def get_vm_stats(self, previous_time=None, previous=None, only_vm=None):
 
         current_time = time.time()
         current = {}
-        if not self.app.vmm.is_xen:
-            raise NotImplementedError("This function requires Xen hypervisor")
         if only_vm:
             xid = only_vm.xid
             if xid < 0:
                 raise qubes.exc.QubesVMNotRunningError(only_vm)
-            info = self.app.vmm.xc.domain_getinfo(xid, 1)
-            if info[0]["domid"] != xid:
-                raise qubes.exc.QubesVMNotRunningError(only_vm)
+            if self.app.vmm.is_xen:
+                info = self.app.vmm.xc.domain_getinfo(xid, 1)
+                if info[0]["domid"] != xid:
+                    raise qubes.exc.QubesVMNotRunningError(only_vm)
+                if (
+                    only_vm_stubdom_xid := getattr(only_vm, "stubdom_xid", -1)
+                ) and only_vm_stubdom_xid > 0:
+                    stubdom_info = self.app.vmm.xc.domain_getinfo(
+                        only_vm_stubdom_xid, 1
+                    )[0]
+                    info.append(stubdom_info)
+            else:
+                if not only_vm.libvirt_domain:
+                    raise qubes.exc.QubesVMNotRunningError(only_vm)
+                dom_info = only_vm.libvirt_domain.info()
+                info = [
+                    {
+                        "domid": only_vm.xid,
+                        "maxmem_kb": dom_info[1],
+                        "mem_kb": dom_info[2],
+                        "online_vcpus": dom_info[3],
+                        "cpu_time": dom_info[4],
+                    }
+                ]
         else:
-            info = self.app.vmm.xc.domain_getinfo(0, 1024)
-
-        # TODO: add stubdomain stats to actual VMs
-        for vm in info:
-            domid = vm["domid"]
+            if self.app.vmm.is_xen:
+                info = self.app.vmm.xc.domain_getinfo(0, 1024)
+            else:
+                running = self.app.vmm.libvirt_conn.listAllDomains(
+                    libvirt.VIR_CONNECT_GET_ALL_DOMAINS_STATS_ACTIVE
+                )
+                info = []
+                for dom in running:
+                    dom_info = dom.info()
+                    dom_info_dict = {
+                        "domid": dom.ID(),
+                        "maxmem_kb": dom_info[1],
+                        "mem_kb": dom_info[2],
+                        "online_vcpus": dom_info[3],
+                        "cpu_time": dom_info[4],
+                    }
+                    info.append(dom_info_dict)
+
+        def sum_stubdom(key, info, domid, stubdom_xid):
+            data = info[domid][key]
+            if stubdom_xid and stubdom_xid > 0:
+                data += info[stubdom_xid][key]
+            return data
+
+        stubdoms = []
+        info = sorted(info, key=lambda domain: domain["domid"])
+        info = {v["domid"]: v for v in info}
+        for domid in info.keys():
+            stubdom_xid = None
+            if domid in stubdoms:
+                continue
             current[domid] = {}
             current[domid].setdefault("is_stubdom", None)
+
             if domid in previous:
                 name = previous[domid]["name"]
                 current[domid]["is_stubdom"] = previous[domid]["is_stubdom"]
+                if current[domid]["is_stubdom"]:
+                    continue
             else:
                 name = self.app.get_name_from_domid(domid)
             if name == "Domain-0":
                 name = "dom0"
             current[domid]["name"] = name
+
             qube = None
             if current[domid]["is_stubdom"] in [None, False]:
                 try:
                     qube = self.app.domains[current[domid]["name"]]
                 except KeyError:
                     current[domid]["is_stubdom"] = True
+                    if domid not in stubdoms:
+                        stubdoms.append(domid)
+                    continue
                 else:
                     current[domid]["is_stubdom"] = False
+            if (
+                qube
+                and (stubdom_xid := getattr(qube, "stubdom_xid", None))
+                and stubdom_xid > 0
+            ):
+                stubdoms.append(stubdom_xid)
 
             if getattr(qube, "virt_mode", None) == "hvm":
                 # Consider videoram.
                 memory_assigned_key = "maxmem_kb"
             else:
                 memory_assigned_key = "mem_kb"
-            current[domid]["memory_assigned_KiB"] = vm[memory_assigned_key]
+            current[domid]["memory_assigned_KiB"] = sum_stubdom(
+                memory_assigned_key, info, domid, stubdom_xid
+            )
             current[domid]["memory_kb"] = current[domid]["memory_assigned_KiB"]
             current[domid]["memory_used_KiB"] = current[domid][
                 "memory_assigned_KiB"
@@ -485,8 +545,13 @@ def get_vm_stats(self, previous_time=None, previous=None, only_vm=None):
                     current[domid]["memory_used_KiB"] = int(meminfo)
                 else:
                     del untrusted_meminfo
-            current[domid]["online_vcpus"] = max(vm["online_vcpus"], 1)
-            current[domid]["cpu_time"] = round(vm["cpu_time"])
+
+            current[domid]["online_vcpus"] = max(
+                sum_stubdom("online_vcpus", info, domid, stubdom_xid), 1
+            )
+            current[domid]["cpu_time"] = round(
+                sum_stubdom("cpu_time", info, domid, stubdom_xid)
+            )
             if domid in previous:
                 current[domid]["cpu_usage_raw"] = round(
                     (current[domid]["cpu_time"] - previous[domid]["cpu_time"])