This commit is contained in:
committed by
Git OBS Bridge
parent
4790095364
commit
0bb51565d6
@@ -1,8 +1,8 @@
|
||||
Index: xen-3.3.1-testing/tools/python/xen/xend/XendNode.py
|
||||
Index: xen-3.4.0-testing/tools/python/xen/xend/XendNode.py
|
||||
===================================================================
|
||||
--- xen-3.3.1-testing.orig/tools/python/xen/xend/XendNode.py
|
||||
+++ xen-3.3.1-testing/tools/python/xen/xend/XendNode.py
|
||||
@@ -650,11 +650,35 @@ class XendNode:
|
||||
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendNode.py
|
||||
+++ xen-3.4.0-testing/tools/python/xen/xend/XendNode.py
|
||||
@@ -809,11 +809,35 @@ class XendNode:
|
||||
|
||||
info['cpu_mhz'] = info['cpu_khz'] / 1000
|
||||
|
||||
@@ -43,7 +43,7 @@ Index: xen-3.3.1-testing/tools/python/xen/xend/XendNode.py
|
||||
|
||||
ITEM_ORDER = ['nr_cpus',
|
||||
'nr_nodes',
|
||||
@@ -665,6 +689,9 @@ class XendNode:
|
||||
@@ -824,6 +848,9 @@ class XendNode:
|
||||
'virt_caps',
|
||||
'total_memory',
|
||||
'free_memory',
|
||||
@@ -53,10 +53,10 @@ Index: xen-3.3.1-testing/tools/python/xen/xend/XendNode.py
|
||||
'node_to_cpu',
|
||||
'node_to_memory'
|
||||
]
|
||||
Index: xen-3.3.1-testing/tools/python/xen/xend/balloon.py
|
||||
Index: xen-3.4.0-testing/tools/python/xen/xend/balloon.py
|
||||
===================================================================
|
||||
--- xen-3.3.1-testing.orig/tools/python/xen/xend/balloon.py
|
||||
+++ xen-3.3.1-testing/tools/python/xen/xend/balloon.py
|
||||
--- xen-3.4.0-testing.orig/tools/python/xen/xend/balloon.py
|
||||
+++ xen-3.4.0-testing/tools/python/xen/xend/balloon.py
|
||||
@@ -41,6 +41,8 @@ SLEEP_TIME_GROWTH = 0.1
|
||||
# label actually shown in the PROC_XEN_BALLOON file.
|
||||
#labels = { 'current' : 'Current allocation',
|
||||
@@ -87,16 +87,16 @@ Index: xen-3.3.1-testing/tools/python/xen/xend/balloon.py
|
||||
+ raise VmError('Failed to query maximum target memory allocation of dom0.')
|
||||
+ return kb
|
||||
+
|
||||
def free(need_mem):
|
||||
def free(need_mem, dominfo):
|
||||
"""Balloon out memory from the privileged domain so that there is the
|
||||
specified required amount (in KiB) free.
|
||||
Index: xen-3.3.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
===================================================================
|
||||
--- xen-3.3.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
|
||||
+++ xen-3.3.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
@@ -1046,6 +1046,27 @@ class XendDomainInfo:
|
||||
|
||||
return None
|
||||
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
|
||||
+++ xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
@@ -1294,6 +1294,27 @@ class XendDomainInfo:
|
||||
dev_str_list = dev_str_list + [dev_str]
|
||||
return dev_str_list
|
||||
|
||||
+ def capAndSetMemoryTarget(self, target):
|
||||
+ """Potentially lowers the requested target to the largest possible
|
||||
@@ -122,11 +122,11 @@ Index: xen-3.3.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
def setMemoryTarget(self, target):
|
||||
"""Set the memory target of this domain.
|
||||
@param target: In MiB.
|
||||
Index: xen-3.3.1-testing/tools/python/xen/xend/server/SrvDomain.py
|
||||
Index: xen-3.4.0-testing/tools/python/xen/xend/server/SrvDomain.py
|
||||
===================================================================
|
||||
--- xen-3.3.1-testing.orig/tools/python/xen/xend/server/SrvDomain.py
|
||||
+++ xen-3.3.1-testing/tools/python/xen/xend/server/SrvDomain.py
|
||||
@@ -171,7 +171,7 @@ class SrvDomain(SrvDir):
|
||||
--- xen-3.4.0-testing.orig/tools/python/xen/xend/server/SrvDomain.py
|
||||
+++ xen-3.4.0-testing/tools/python/xen/xend/server/SrvDomain.py
|
||||
@@ -172,7 +172,7 @@ class SrvDomain(SrvDir):
|
||||
|
||||
|
||||
def op_mem_target_set(self, _, req):
|
||||
|
Reference in New Issue
Block a user