Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'qmemman' of git://qubes-os.org/rafal/core

Browse Source 
Conflicts:
	dom0/qvm-core/qubes.py
This commit is contained in:
Joanna Rutkowska 2010-09-23 12:31:25 +02:00
commit ba59ac733e
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dom0/qvm-core/qubes.py
View File

@ -503,6 +503,13 @@ class QubesVm(object):
pass pass
def get_total_xen_memory(self):
hosts = xend_session.session.xenapi.host.get_all()
host_record = xend_session.session.xenapi.host.get_record(hosts[0])
host_metrics_record = xend_session.session.xenapi.host_metrics.get_record(host_record["metrics"])
ret = host_metrics_record["memory_total"]
return long(ret)
def start(self, debug_console = False, verbose = False, preparing_dvm = False): def start(self, debug_console = False, verbose = False, preparing_dvm = False):
if dry_run: if dry_run:
return return
@ -517,6 +524,10 @@ class QubesVm(object):
if verbose: if verbose:
print "--> Loading the VM (type = {0})...".format(self.type) print "--> Loading the VM (type = {0})...".format(self.type)
if not self.is_netvm():
total_mem_mb = self.get_total_xen_memory()/1024/1024
xend_session.xend_server.xend.domain.maxmem_set(self.name, total_mem_mb)
mem_required = self.get_mem_dynamic_max() mem_required = self.get_mem_dynamic_max()
qmemman_client = QMemmanClient() qmemman_client = QMemmanClient()
if not qmemman_client.request_memory(mem_required): if not qmemman_client.request_memory(mem_required):