Merge branch 'spring-merge' of git.qubes-os.org:/var/lib/qubes/git/rafal/core

This commit is contained in:
Joanna Rutkowska 2011-04-05 14:24:52 +02:00
commit 97ca67c974

View File

@ -20,6 +20,7 @@ class SystemState:
self.xs = xen.lowlevel.xs.xs()
self.BALOON_DELAY = 0.1
self.XEN_FREE_MEM_LEFT = 50*1024*1024
self.XEN_FREE_MEM_MIN = 25*1024*1024
def add_domain(self, id):
self.domdict[id] = DomainState(id)
@ -75,7 +76,7 @@ class SystemState:
while True:
xenfree = self.get_free_xen_memory()
print 'got xenfree=', xenfree
if xenfree >= memsize + self.XEN_FREE_MEM_LEFT:
if xenfree >= memsize + self.XEN_FREE_MEM_MIN:
return True
self.refresh_memactual()
if prev_memory_actual is not None: