xend: fix ballooning bug
PATCH 1/1 xend: fix ballooning bug
Hi,
c/s 18960 introduced a bug when xend balloons memory. The function balloon.free requires a reference to a XendDomainInfo object, which is missing in one call of this function. Attached patch fixes this. Also replaced the variable name "self" in the (classless) function with something more descriptive.
Signed-off-by Andre Przywara <[email protected]>
Reported-by Maik Hentsche <[email protected]>
Regards,
Andre.
Signature · 9 lines
Andre Przywara AMD-Operating System Research Center (OSRC), Dresden, Germany Tel: +49 351 277-84917 ----to satisfy European Law for business letters: Advanced Micro Devices GmbH Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Jochen Polster; Thomas M. McCoy; Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
tools/python/xen/xend/XendDomainInfo.py +1 -1
@@ -1199,7 +1199,7 @@ if self.domid >= 0: if target > memory_cur: - balloon.free( (target-memory_cur)*1024 ) + balloon.free((target - memory_cur) * 1024, self) self.storeVm("memory", target) self.storeDom("memory/target", target << 10) xc.domain_set_target_mem(self.domid,
tools/python/xen/xend/balloon.py +2 -2
@@ -67,7 +67,7 @@ raise VmError('Failed to query target memory allocation of dom0.') return kb -def free(need_mem ,self): +def free(need_mem, dominfo): """Balloon out memory from the privileged domain so that there is the specified required amount (in KiB) free. """
@@ -130,7 +130,7 @@ if physinfo['nr_nodes'] > 1 and retries == 0: oldnode = -1 waitscrub = 1 - vcpus = self.info['cpus'][0] + vcpus = dominfo.info['cpus'][0] for vcpu in vcpus: nodenum = 0 for node in physinfo['node_to_cpu']:
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel