This commit is contained in:
committed by
Git OBS Bridge
parent
0ef5182655
commit
9c16971e0e
@@ -1,8 +1,8 @@
|
||||
Index: xen-3.2-testing/tools/python/xen/lowlevel/xc/xc.c
|
||||
Index: xen-3.2.1-testing/tools/python/xen/lowlevel/xc/xc.c
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/python/xen/lowlevel/xc/xc.c
|
||||
+++ xen-3.2-testing/tools/python/xen/lowlevel/xc/xc.c
|
||||
@@ -632,14 +632,14 @@ static PyObject *pyxc_hvm_build(XcObject
|
||||
--- xen-3.2.1-testing.orig/tools/python/xen/lowlevel/xc/xc.c
|
||||
+++ xen-3.2.1-testing/tools/python/xen/lowlevel/xc/xc.c
|
||||
@@ -638,14 +638,14 @@ static PyObject *pyxc_hvm_build(XcObject
|
||||
int i;
|
||||
#endif
|
||||
char *image;
|
||||
@@ -21,7 +21,7 @@ Index: xen-3.2-testing/tools/python/xen/lowlevel/xc/xc.c
|
||||
return NULL;
|
||||
|
||||
if ( xc_hvm_build(self->xc_handle, dom, memsize, image) != 0 )
|
||||
@@ -664,6 +664,7 @@ static PyObject *pyxc_hvm_build(XcObject
|
||||
@@ -670,6 +670,7 @@ static PyObject *pyxc_hvm_build(XcObject
|
||||
va_hvm->checksum = -sum;
|
||||
munmap(va_map, XC_PAGE_SIZE);
|
||||
#endif
|
||||
@@ -29,24 +29,23 @@ Index: xen-3.2-testing/tools/python/xen/lowlevel/xc/xc.c
|
||||
|
||||
return Py_BuildValue("{}");
|
||||
}
|
||||
Index: xen-3.2-testing/tools/python/xen/xend/XendConfig.py
|
||||
Index: xen-3.2.1-testing/tools/python/xen/xend/XendConfig.py
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/python/xen/xend/XendConfig.py
|
||||
+++ xen-3.2-testing/tools/python/xen/xend/XendConfig.py
|
||||
@@ -126,7 +126,7 @@ LEGACY_CFG_TO_XENAPI_CFG = reverse_dict(
|
||||
# Platform configuration keys.
|
||||
XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 'boot', 'device_model', 'display',
|
||||
'fda', 'fdb', 'keymap', 'isa', 'localtime', 'monitor',
|
||||
- 'nographic', 'pae', 'rtc_timeoffset', 'serial', 'sdl',
|
||||
+ 'nographic', 'pae', 'extid', 'rtc_timeoffset', 'serial', 'sdl',
|
||||
'soundhw','stdvga', 'usb', 'usbdevice', 'hpet', 'vnc',
|
||||
'vncconsole', 'vncdisplay', 'vnclisten', 'timer_mode',
|
||||
'vncpasswd', 'vncunused', 'xauthority', 'pci', 'vhpt',
|
||||
Index: xen-3.2-testing/tools/python/xen/xend/image.py
|
||||
--- xen-3.2.1-testing.orig/tools/python/xen/xend/XendConfig.py
|
||||
+++ xen-3.2.1-testing/tools/python/xen/xend/XendConfig.py
|
||||
@@ -138,6 +138,7 @@ XENAPI_PLATFORM_CFG_TYPES = {
|
||||
'monitor': int,
|
||||
'nographic': int,
|
||||
'pae' : int,
|
||||
+ 'extid' : int,
|
||||
'rtc_timeoffset': int,
|
||||
'serial': str,
|
||||
'sdl': int,
|
||||
Index: xen-3.2.1-testing/tools/python/xen/xend/image.py
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/python/xen/xend/image.py
|
||||
+++ xen-3.2-testing/tools/python/xen/xend/image.py
|
||||
@@ -432,6 +432,7 @@ class HVMImageHandler(ImageHandler):
|
||||
--- xen-3.2.1-testing.orig/tools/python/xen/xend/image.py
|
||||
+++ xen-3.2.1-testing/tools/python/xen/xend/image.py
|
||||
@@ -438,6 +438,7 @@ class HVMImageHandler(ImageHandler):
|
||||
|
||||
self.apic = int(vmConfig['platform'].get('apic', 0))
|
||||
self.acpi = int(vmConfig['platform'].get('acpi', 0))
|
||||
@@ -54,7 +53,7 @@ Index: xen-3.2-testing/tools/python/xen/xend/image.py
|
||||
self.guest_os_type = vmConfig['platform'].get('guest_os_type')
|
||||
|
||||
# Return a list of cmd line args to the device models based on the
|
||||
@@ -522,6 +523,7 @@ class HVMImageHandler(ImageHandler):
|
||||
@@ -528,6 +529,7 @@ class HVMImageHandler(ImageHandler):
|
||||
log.debug("store_evtchn = %d", store_evtchn)
|
||||
log.debug("memsize = %d", mem_mb)
|
||||
log.debug("vcpus = %d", self.vm.getVCpuCount())
|
||||
@@ -62,7 +61,7 @@ Index: xen-3.2-testing/tools/python/xen/xend/image.py
|
||||
log.debug("acpi = %d", self.acpi)
|
||||
log.debug("apic = %d", self.apic)
|
||||
|
||||
@@ -529,6 +531,7 @@ class HVMImageHandler(ImageHandler):
|
||||
@@ -535,6 +537,7 @@ class HVMImageHandler(ImageHandler):
|
||||
image = self.kernel,
|
||||
memsize = mem_mb,
|
||||
vcpus = self.vm.getVCpuCount(),
|
||||
@@ -70,10 +69,10 @@ Index: xen-3.2-testing/tools/python/xen/xend/image.py
|
||||
acpi = self.acpi,
|
||||
apic = self.apic)
|
||||
rc['notes'] = { 'SUSPEND_CANCEL': 1 }
|
||||
Index: xen-3.2-testing/tools/python/xen/xm/create.py
|
||||
Index: xen-3.2.1-testing/tools/python/xen/xm/create.py
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/python/xen/xm/create.py
|
||||
+++ xen-3.2-testing/tools/python/xen/xm/create.py
|
||||
--- xen-3.2.1-testing.orig/tools/python/xen/xm/create.py
|
||||
+++ xen-3.2.1-testing/tools/python/xen/xm/create.py
|
||||
@@ -203,6 +203,10 @@ gopts.var('timer_mode', val='TIMER_MODE'
|
||||
use="""Timer mode (0=delay virtual time when ticks are missed;
|
||||
1=virtual time is always wallclock time.""")
|
||||
@@ -85,7 +84,7 @@ Index: xen-3.2-testing/tools/python/xen/xm/create.py
|
||||
gopts.var('acpi', val='ACPI',
|
||||
fn=set_int, default=1,
|
||||
use="Disable or enable ACPI of HVM domain.")
|
||||
@@ -729,7 +733,7 @@ def configure_vifs(config_devs, vals):
|
||||
@@ -734,7 +738,7 @@ def configure_vifs(config_devs, vals):
|
||||
def configure_hvm(config_image, vals):
|
||||
"""Create the config for HVM devices.
|
||||
"""
|
||||
|
Reference in New Issue
Block a user