shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-01-11 05:17:59 +03:00
Code Issues Projects Releases Wiki Activity

domain: Use support infra to check if memory stats supported

Browse Source
This commit is contained in:
Cole Robinson 2014-01-12 17:52:13 -05:00
parent 55d6b7f377
commit 6db30432a5
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
virtManager/domain.py
View File

@ -245,8 +245,7 @@ class vmmDomain(vmmLibvirtObject):
self.managedsave_supported = False
self.remote_console_supported = False
self.title_supported = False
self._mem_stats_supported = True
self.mem_stats_supported = False
self._enable_mem_stats = False
@ -280,6 +279,8 @@ class vmmDomain(vmmLibvirtObject):
self.conn.SUPPORT_DOMAIN_CONSOLE_STREAM, self._backend)
self.title_supported = self.conn.check_support(
self.conn.SUPPORT_DOMAIN_GET_METADATA, self._backend)
self.mem_stats_supported = self.conn.check_support(
self.conn.SUPPORT_DOMAIN_MEMORY_STATS, self._backend)
# Determine available XML flags (older libvirt versions will error
# out if passed SECURE_XML, INACTIVE_XML, etc)
@ -1743,7 +1744,7 @@ class vmmDomain(vmmLibvirtObject):
return rd, wr
def _sample_mem_stats(self):
if (not self._mem_stats_supported or
if (not self.mem_stats_supported or
not self._enable_mem_stats or
not self.is_active()):
return 0, 0
@ -1758,11 +1759,7 @@ class vmmDomain(vmmLibvirtObject):
curmem = stats['rss']
totalmem = stats['actual']
except libvirt.libvirtError, err:
if util.is_error_nosupport(err):
logging.debug("Mem stats not supported: %s", err)
self._mem_stats_supported = False
else:
logging.error("Error reading mem stats: %s", err)
logging.error("Error reading mem stats: %s", err)
pcentCurrMem = curmem * 100.0 / totalmem
pcentCurrMem = max(0.0, min(pcentCurrMem, 100.0))

1
virtinst/support.py
View File

@ -315,6 +315,7 @@ SUPPORT_DOMAIN_LIST_SNAPSHOTS = _make(function="virDomain.listAllSnapshots",
args=())
SUPPORT_DOMAIN_GET_METADATA = _make(function="virDomain.metadata",
args=(getattr(libvirt, "VIR_DOMAIN_METADATA_TITLE", 1), None, 0))
SUPPORT_DOMAIN_MEMORY_STATS = _make(function="virDomain.memoryStats", args=())
# Pool checks