rpm/xen
SHA256
1
0
Fork 0
forked from pool/xen
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=36

Browse Source
This commit is contained in:
OBS User unknown
2007-12-20 15:46:41 +00:00
committed by Git OBS Bridge
parent be29349429
commit cf62e5ae4d
135 changed files with 4018 additions and 13988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
xen-max-free-mem.diff
View File

@@ -1,14 +1,15 @@
Index: xen-3.1-testing/tools/python/xen/xend/XendNode.py
Index: xen-3.2-testing/tools/python/xen/xend/XendNode.py
===================================================================
--- xen-3.1-testing.orig/tools/python/xen/xend/XendNode.py
+++ xen-3.1-testing/tools/python/xen/xend/XendNode.py
@@ -541,9 +541,33 @@ class XendNode:
info['threads_per_core'])
--- xen-3.2-testing.orig/tools/python/xen/xend/XendNode.py
+++ xen-3.2-testing/tools/python/xen/xend/XendNode.py
@@ -585,10 +585,34 @@ class XendNode:
info['cpu_mhz'] = info['cpu_khz'] / 1000
- # physinfo is in KiB, need it in MiB
- info['total_memory'] = info['total_memory'] / 1024
- info['free_memory'] = info['free_memory'] / 1024
- info['node_to_cpu'] = self.format_node_to_cpu(info)
+ configured_floor = xendoptions().get_dom0_min_mem() * 1024
+ from xen.xend import balloon
+ try:
@@ -27,6 +28,7 @@ Index: xen-3.1-testing/tools/python/xen/xend/XendNode.py
+ info['total_memory'] = info['total_memory'] / 1024
+ info['free_memory'] = info['free_memory'] / 1024
+ info['max_free_memory'] = info['max_free_memory'] / 1024
+ info['node_to_cpu'] = self.format_node_to_cpu(info)
+
+ # FIXME: These are hard-coded to be the inverse of the getXenMemory
+ # functions in image.py. Find a cleaner way.
@@ -39,20 +41,20 @@ Index: xen-3.1-testing/tools/python/xen/xend/XendNode.py
ITEM_ORDER = ['nr_cpus',
'nr_nodes',
@@ -554,6 +578,9 @@ class XendNode:
@@ -598,6 +622,9 @@ class XendNode:
'hw_caps',
'total_memory',
'free_memory',
+ 'max_free_memory',
+ 'max_para_memory',
+ 'max_hvm_memory',
'node_to_cpu'
]
return [[k, info[k]] for k in ITEM_ORDER]
Index: xen-3.1-testing/tools/python/xen/xend/balloon.py
Index: xen-3.2-testing/tools/python/xen/xend/balloon.py
===================================================================
--- xen-3.1-testing.orig/tools/python/xen/xend/balloon.py
+++ xen-3.1-testing/tools/python/xen/xend/balloon.py
--- xen-3.2-testing.orig/tools/python/xen/xend/balloon.py
+++ xen-3.2-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',
@@ -86,11 +88,11 @@ Index: xen-3.1-testing/tools/python/xen/xend/balloon.py
def free(need_mem):
"""Balloon out memory from the privileged domain so that there is the
specified required amount (in KiB) free.
Index: xen-3.1-testing/tools/python/xen/xend/XendDomainInfo.py
Index: xen-3.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
--- xen-3.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-3.1-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -644,6 +644,27 @@ class XendDomainInfo:
--- xen-3.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-3.2-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -680,6 +680,27 @@ class XendDomainInfo:
return dev_info
@@ -118,11 +120,11 @@ Index: xen-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.1-testing/tools/python/xen/xend/server/SrvDomain.py
Index: xen-3.2-testing/tools/python/xen/xend/server/SrvDomain.py
===================================================================
--- xen-3.1-testing.orig/tools/python/xen/xend/server/SrvDomain.py
+++ xen-3.1-testing/tools/python/xen/xend/server/SrvDomain.py
@@ -169,7 +169,7 @@ class SrvDomain(SrvDir):
--- xen-3.2-testing.orig/tools/python/xen/xend/server/SrvDomain.py
+++ xen-3.2-testing/tools/python/xen/xend/server/SrvDomain.py
@@ -170,7 +170,7 @@ class SrvDomain(SrvDir):
def op_mem_target_set(self, _, req):