Skip to content

Commit f79ca6c

Browse files
committed
Remove commented code
1 parent badbe1e commit f79ca6c

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

qubes/qmemman/algo.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,6 @@ def balance_when_enough_memory(
190190
donors_rq.append((domid, target))
191191
else:
192192
acceptors_rq.append((domid, target))
193-
194-
# print 'balance(enough): xen_free_memory=', xen_free_memory, \
195-
# 'requests:', donors_rq + acceptors_rq
196193
return donors_rq + acceptors_rq
197194

198195

@@ -233,8 +230,6 @@ def balance_when_low_on_memory(
233230
# do not try to give more memory than static max
234231
target = min(int(0.999 * target_nonint), dom.memory_maximum)
235232
acceptors_rq.append((domid, target))
236-
# print 'balance(low): xen_free_memory=', xen_free_memory, 'requests:',
237-
# donors_rq + acceptors_rq
238233
return donors_rq + acceptors_rq
239234

240235

@@ -270,9 +265,6 @@ def memory_info(xen_free_memory, domain_dictionary):
270265
if dom.no_progress:
271266
continue
272267
need = memory_needed(dom)
273-
# print 'domain' , domid, 'act/pref', \
274-
# dom.memory_actual, prefmem(dom), \
275-
# 'need=', need
276268
if need < 0 or dom.memory_actual >= dom.memory_maximum:
277269
donors.append(domid)
278270
else:

qubes/qmemman/systemstate.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,9 @@ def refresh_memactual(self):
143143
# the previous line used to be
144144
# dom.memory_maximum = domain['maxmem_kb']*1024
145145
# but domain['maxmem_kb'] changes in self.mem_set as well,
146-
# and this results in the memory never increasing
147-
# in fact, the only possible case of nonexisting
148-
# memory/static-max is dom0
149-
# see #307
146+
# and this results in the memory never increasing in fact,
147+
# the only possible case of nonexisting memory/static-max
148+
# is dom0, see #307
150149

151150
def clear_outdated_error_markers(self):
152151
# Clear outdated errors
@@ -436,9 +435,3 @@ def do_balance(self):
436435
file.write(str(memory_dictionary["total_available_memory"]))
437436
os.chmod(avail_mem_file_tmp, 0o644)
438437
os.replace(avail_mem_file_tmp, avail_mem_file)
439-
440-
# pylint: disable=line-too-long
441-
# for i in self.domdict.keys():
442-
# print 'domain ', i, ' meminfo=', dom.mem_used, 'actual mem', dom.memory_actual
443-
# print 'domain ', i, 'actual mem', dom.memory_actual
444-
# print 'xen free mem', self.get_free_xen_memory()

0 commit comments

Comments
 (0)