This commit is contained in:
committed by
Git OBS Bridge
parent
616dfa112f
commit
b4c780fd71
@@ -1,7 +1,7 @@
|
||||
Index: xen-3.4.0-testing/tools/python/xen/lowlevel/xc/xc.c
|
||||
Index: xen-3.4.1-testing/tools/python/xen/lowlevel/xc/xc.c
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/tools/python/xen/lowlevel/xc/xc.c
|
||||
+++ xen-3.4.0-testing/tools/python/xen/lowlevel/xc/xc.c
|
||||
--- xen-3.4.1-testing.orig/tools/python/xen/lowlevel/xc/xc.c
|
||||
+++ xen-3.4.1-testing/tools/python/xen/lowlevel/xc/xc.c
|
||||
@@ -890,14 +890,14 @@ static PyObject *pyxc_hvm_build(XcObject
|
||||
int i;
|
||||
#endif
|
||||
@@ -31,10 +31,10 @@ Index: xen-3.4.0-testing/tools/python/xen/lowlevel/xc/xc.c
|
||||
|
||||
return Py_BuildValue("{}");
|
||||
}
|
||||
Index: xen-3.4.0-testing/tools/python/xen/xend/XendConfig.py
|
||||
Index: xen-3.4.1-testing/tools/python/xen/xend/XendConfig.py
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendConfig.py
|
||||
+++ xen-3.4.0-testing/tools/python/xen/xend/XendConfig.py
|
||||
--- xen-3.4.1-testing.orig/tools/python/xen/xend/XendConfig.py
|
||||
+++ xen-3.4.1-testing/tools/python/xen/xend/XendConfig.py
|
||||
@@ -143,6 +143,7 @@ XENAPI_PLATFORM_CFG_TYPES = {
|
||||
'monitor': int,
|
||||
'nographic': int,
|
||||
@@ -43,11 +43,11 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendConfig.py
|
||||
'rtc_timeoffset': int,
|
||||
'serial': str,
|
||||
'sdl': int,
|
||||
Index: xen-3.4.0-testing/tools/python/xen/xend/image.py
|
||||
Index: xen-3.4.1-testing/tools/python/xen/xend/image.py
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/tools/python/xen/xend/image.py
|
||||
+++ xen-3.4.0-testing/tools/python/xen/xend/image.py
|
||||
@@ -764,6 +764,7 @@ class HVMImageHandler(ImageHandler):
|
||||
--- xen-3.4.1-testing.orig/tools/python/xen/xend/image.py
|
||||
+++ xen-3.4.1-testing/tools/python/xen/xend/image.py
|
||||
@@ -762,6 +762,7 @@ class HVMImageHandler(ImageHandler):
|
||||
|
||||
self.apic = int(vmConfig['platform'].get('apic', 0))
|
||||
self.acpi = int(vmConfig['platform'].get('acpi', 0))
|
||||
@@ -55,7 +55,7 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/image.py
|
||||
self.guest_os_type = vmConfig['platform'].get('guest_os_type')
|
||||
|
||||
|
||||
@@ -880,6 +881,7 @@ class HVMImageHandler(ImageHandler):
|
||||
@@ -878,6 +879,7 @@ class HVMImageHandler(ImageHandler):
|
||||
log.debug("memsize = %d", memmax_mb)
|
||||
log.debug("target = %d", mem_mb)
|
||||
log.debug("vcpus = %d", self.vm.getVCpuCount())
|
||||
@@ -63,7 +63,7 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/image.py
|
||||
log.debug("acpi = %d", self.acpi)
|
||||
log.debug("apic = %d", self.apic)
|
||||
|
||||
@@ -888,6 +890,7 @@ class HVMImageHandler(ImageHandler):
|
||||
@@ -886,6 +888,7 @@ class HVMImageHandler(ImageHandler):
|
||||
memsize = memmax_mb,
|
||||
target = mem_mb,
|
||||
vcpus = self.vm.getVCpuCount(),
|
||||
@@ -71,10 +71,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/image.py
|
||||
acpi = self.acpi,
|
||||
apic = self.apic)
|
||||
rc['notes'] = { 'SUSPEND_CANCEL': 1 }
|
||||
Index: xen-3.4.0-testing/tools/python/xen/xm/create.py
|
||||
Index: xen-3.4.1-testing/tools/python/xen/xm/create.py
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/tools/python/xen/xm/create.py
|
||||
+++ xen-3.4.0-testing/tools/python/xen/xm/create.py
|
||||
--- xen-3.4.1-testing.orig/tools/python/xen/xm/create.py
|
||||
+++ xen-3.4.1-testing/tools/python/xen/xm/create.py
|
||||
@@ -229,6 +229,10 @@ gopts.var('viridian', val='VIRIDIAN',
|
||||
use="""Expose Viridian interface to x86 HVM guest?
|
||||
(Default is 0).""")
|
||||
|
Reference in New Issue
Block a user