OBS User unknown
2007-05-12 10:54:21 +00:00
committed by Git OBS Bridge
parent b52c73e219
commit 28b141bb6f
19 changed files with 552 additions and 111 deletions

View File

@@ -1,8 +1,8 @@
Index: xen-3.0.5-testing/tools/python/xen/xend/XendNode.py
Index: xen-3.1-testing/tools/python/xen/xend/XendNode.py
===================================================================
--- xen-3.0.5-testing.orig/tools/python/xen/xend/XendNode.py
+++ xen-3.0.5-testing/tools/python/xen/xend/XendNode.py
@@ -558,9 +558,33 @@ class XendNode:
--- 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'])
info['cpu_mhz'] = info['cpu_khz'] / 1000
@@ -39,7 +39,7 @@ Index: xen-3.0.5-testing/tools/python/xen/xend/XendNode.py
ITEM_ORDER = ['nr_cpus',
'nr_nodes',
@@ -571,6 +595,9 @@ class XendNode:
@@ -554,6 +578,9 @@ class XendNode:
'hw_caps',
'total_memory',
'free_memory',
@@ -49,10 +49,10 @@ Index: xen-3.0.5-testing/tools/python/xen/xend/XendNode.py
]
return [[k, info[k]] for k in ITEM_ORDER]
Index: xen-3.0.5-testing/tools/python/xen/xend/balloon.py
Index: xen-3.1-testing/tools/python/xen/xend/balloon.py
===================================================================
--- xen-3.0.5-testing.orig/tools/python/xen/xend/balloon.py
+++ xen-3.0.5-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
@@ -41,6 +41,8 @@ SLEEP_TIME_GROWTH = 0.1
# label actually shown in the PROC_XEN_BALLOON file.
labels = { 'current' : 'Current allocation',
@@ -86,10 +86,10 @@ Index: xen-3.0.5-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.0.5-testing/tools/python/xen/xend/XendDomainInfo.py
Index: xen-3.1-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
--- xen-3.0.5-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-3.0.5-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
@@ -573,6 +573,27 @@ class XendDomainInfo:
return sxprs
@@ -118,10 +118,10 @@ Index: xen-3.0.5-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.0.5-testing/tools/python/xen/xend/server/SrvDomain.py
Index: xen-3.1-testing/tools/python/xen/xend/server/SrvDomain.py
===================================================================
--- xen-3.0.5-testing.orig/tools/python/xen/xend/server/SrvDomain.py
+++ xen-3.0.5-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):