diff --git a/virtManager/lib/statsmanager.py b/virtManager/lib/statsmanager.py index cc1353831..d19129f35 100644 --- a/virtManager/lib/statsmanager.py +++ b/virtManager/lib/statsmanager.py @@ -109,8 +109,6 @@ class _VMStatsList(vmmGObject): return vector def get_in_out_vector(self, name1, name2, limit, ceil): - if ceil is None: - ceil = max(self.get_record(name1), self.get_record(name2), 10.0) return (self.get_vector(name1, limit, ceil=ceil), self.get_vector(name2, limit, ceil=ceil)) diff --git a/virtManager/object/domain.py b/virtManager/object/domain.py index 7310db101..60e837e6f 100644 --- a/virtManager/object/domain.py +++ b/virtManager/object/domain.py @@ -1455,12 +1455,12 @@ class vmmDomain(vmmLibvirtObject): return self.network_tx_rate() + self.network_rx_rate() def network_traffic_max_rate(self): stats = self._get_stats() - return max(stats.netRxMaxRate, stats.netTxMaxRate) + return max(stats.netRxMaxRate, stats.netTxMaxRate, 10.0) def disk_io_rate(self): return self.disk_read_rate() + self.disk_write_rate() def disk_io_max_rate(self): stats = self._get_stats() - return max(stats.diskRdMaxRate, stats.diskWrMaxRate) + return max(stats.diskRdMaxRate, stats.diskWrMaxRate, 10.0) def host_cpu_time_vector(self, limit=None): return self._get_stats().get_vector("cpuHostPercent", limit) @@ -1469,9 +1469,13 @@ class vmmDomain(vmmLibvirtObject): def stats_memory_vector(self, limit=None): return self._get_stats().get_vector("currMemPercent", limit) def network_traffic_vectors(self, limit=None, ceil=None): + if ceil is None: + ceil = self.network_traffic_max_rate() return self._get_stats().get_in_out_vector( "netRxRate", "netTxRate", limit, ceil) def disk_io_vectors(self, limit=None, ceil=None): + if ceil is None: + ceil = self.disk_io_max_rate() return self._get_stats().get_in_out_vector( "diskRdRate", "diskWrRate", limit, ceil)