Browse Source

Fix generating documentation

Wojtek Porczyk 8 years ago
parent
commit
62da967f78
3 changed files with 4 additions and 10 deletions
  1. 0 1
      doc/index.rst
  2. 0 8
      doc/qubes-plugins.rst
  3. 4 1
      qubes/qmemman/__init__.py

+ 0 - 1
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

+ 0 - 8
doc/qubes-plugins.rst

@@ -1,8 +0,0 @@
-:py:mod:`qubes.plugins` -- Plugin helpers
-=========================================
-
-.. automodule:: qubes.plugins
-   :members:
-   :show-inheritance:
-
-.. vim: ts=3 sw=3 et

+ 4 - 1
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))