diff --git a/doc/index.rst b/doc/index.rst index 0509c8e8..ee17675e 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -17,7 +17,6 @@ manpages and API documentation. For primary user documentation, see qubes-vm/index qubes-events qubes-exc - qubes-plugins qubes-ext qubes-log qubes-tools/index diff --git a/doc/qubes-plugins.rst b/doc/qubes-plugins.rst deleted file mode 100644 index 48323d8c..00000000 --- a/doc/qubes-plugins.rst +++ /dev/null @@ -1,8 +0,0 @@ -:py:mod:`qubes.plugins` -- Plugin helpers -========================================= - -.. automodule:: qubes.plugins - :members: - :show-inheritance: - -.. vim: ts=3 sw=3 et diff --git a/qubes/qmemman/__init__.py b/qubes/qmemman/__init__.py index e7262bd2..3168534b 100644 --- a/qubes/qmemman/__init__.py +++ b/qubes/qmemman/__init__.py @@ -70,7 +70,10 @@ class SystemState(object): # see https://wiki.openstack.org/wiki/XenServer/Overhead # we divide total and free physical memory by this to get "assignable" memory self.MEM_OVERHEAD_FACTOR = 1.0 / 1.00781 - self.ALL_PHYS_MEM = int(self.xc.physinfo()['total_memory']*1024 * self.MEM_OVERHEAD_FACTOR) + try: + self.ALL_PHYS_MEM = int(self.xc.physinfo()['total_memory']*1024 * self.MEM_OVERHEAD_FACTOR) + except xen.lowlevel.xc.Error: + self.ALL_PHYS_MEM = 0 def add_domain(self, id): self.log.debug('add_domain(id={!r})'.format(id))