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

- bnc#681302 - xm create -x <guest> returns "ImportError: No module

Browse Source 
named ext"
  xm-create-xflag.patch

- Fix xen-utils to cope with xen-unstable c/s 21483

- xz-devel is available since 11.2, make it optional for SLES11SP1

- bnc#665610 - xm console > 1 to same VM messes up both consoles
  Upstream rejected due to portability concern, see
  http://lists.xensource.com/archives/html/xen-devel/2011-02/msg00942.html
  xenconsole-no-multiple-connections.patch
- Enable support for kernel decompression for gzip, bzip2, and LZMA
  so that kernels compressed with any of these methods can be
  launched.

- Update to Xen 4.1.0 c/s 22861

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=102
This commit is contained in:
Charles Arnold
2011-03-21 16:47:37 +00:00
committed by Git OBS Bridge
parent 213dc42b7c
commit 05bedd5488
168 changed files with 1330 additions and 24685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,16 +1,15 @@
Index: xen-4.0.2-testing/tools/python/xen/xend/XendNode.py
Index: xen-4.1.0-testing/tools/python/xen/xend/XendNode.py
===================================================================
--- xen-4.0.2-testing.orig/tools/python/xen/xend/XendNode.py
+++ xen-4.0.2-testing/tools/python/xen/xend/XendNode.py
@@ -916,15 +916,39 @@ class XendNode:
--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendNode.py
+++ xen-4.1.0-testing/tools/python/xen/xend/XendNode.py
@@ -949,10 +949,33 @@ 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)
- info['node_to_memory'] = \
- info['free_cpus'] = len(XendCPUPool.unbound_cpus())
+ configured_floor = xendoptions().get_dom0_min_mem() * 1024
+ from xen.xend import balloon
+ try:
@@ -29,12 +28,7 @@ Index: xen-4.0.2-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)
+ info['node_to_memory'] = \
self.format_node_to_memory(info, 'node_to_memory')
info['node_to_dma32_mem'] = \
self.format_node_to_memory(info, 'node_to_dma32_mem')
+
+ # FIXME: These are hard-coded to be the inverse of the getXenMemory
+ # functions in image.py. Find a cleaner way.
+ info['max_para_memory'] = info['max_free_memory'] - 4
@@ -43,24 +37,23 @@ Index: xen-4.0.2-testing/tools/python/xen/xend/XendNode.py
+ info['max_hvm_memory'] = int((info['max_free_memory']-12) * (1-2.4/1024))
+ if info['max_hvm_memory'] < 0:
+ info['max_hvm_memory'] = 0
+
ITEM_ORDER = ['nr_cpus',
'nr_nodes',
'cores_per_socket',
@@ -934,6 +958,9 @@ class XendNode:
'virt_caps',
@@ -964,6 +987,9 @@ class XendNode:
'total_memory',
'free_memory',
'free_cpus',
+ 'max_free_memory',
+ 'max_para_memory',
+ 'max_hvm_memory',
'node_to_cpu',
'node_to_memory',
'node_to_dma32_mem',
Index: xen-4.0.2-testing/tools/python/xen/xend/balloon.py
]
if show_numa != 0:
Index: xen-4.1.0-testing/tools/python/xen/xend/balloon.py
===================================================================
--- xen-4.0.2-testing.orig/tools/python/xen/xend/balloon.py
+++ xen-4.0.2-testing/tools/python/xen/xend/balloon.py
--- xen-4.1.0-testing.orig/tools/python/xen/xend/balloon.py
+++ xen-4.1.0-testing/tools/python/xen/xend/balloon.py
@@ -43,6 +43,8 @@ SLEEP_TIME_GROWTH = 0.1
# label actually shown in the PROC_XEN_BALLOON file.
#labels = { 'current' : 'Current allocation',
@@ -94,11 +87,11 @@ Index: xen-4.0.2-testing/tools/python/xen/xend/balloon.py
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-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
--- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -1473,6 +1473,27 @@ class XendDomainInfo:
--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -1459,6 +1459,27 @@ class XendDomainInfo:
pci_conf = self.info['devices'][dev_uuid][1]
return map(pci_dict_to_bdf_str, pci_conf['devs'])
@@ -126,11 +119,11 @@ Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
def setMemoryTarget(self, target):
"""Set the memory target of this domain.
@param target: In MiB.
Index: xen-4.0.2-testing/tools/python/xen/xend/server/SrvDomain.py
Index: xen-4.1.0-testing/tools/python/xen/xend/server/SrvDomain.py
===================================================================
--- xen-4.0.2-testing.orig/tools/python/xen/xend/server/SrvDomain.py
+++ xen-4.0.2-testing/tools/python/xen/xend/server/SrvDomain.py
@@ -173,7 +173,7 @@ class SrvDomain(SrvDir):
--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/SrvDomain.py
+++ xen-4.1.0-testing/tools/python/xen/xend/server/SrvDomain.py
@@ -187,7 +187,7 @@ class SrvDomain(SrvDir):
def op_mem_target_set(self, _, req):