9a05aa7fc4
22707-x2apic-preenabled-check.patch - bnc#641419 - L3: Xen: qemu-dm reports "xc_map_foreign_batch: mmap failed: Cannot allocate memory" 7434-qemu-rlimit-as.patch - Additional or upstream patches from Jan 22693-fam10-mmio-conf-base-protect.patch 22694-x86_64-no-weak.patch 22708-xenctx-misc.patch 21432-4.0-cpu-boot-failure.patch 22645-amd-flush-filter.patch qemu-fix-7433.patch - Maintain compatibility with the extid flag even though it is deprecated for both legacy and sxp config files. hv_extid_compatibility.patch - bnc#649209-improve suspend eventchn lock suspend_evtchn_lock.patch - Removed the hyper-v shim patches in favor of using the upstream version. - bnc#641419 - L3: Xen: qemu-dm reports "xc_map_foreign_batch: mmap failed: Cannot allocate memory" qemu-rlimit-as.patch - Upstream c/s 7433 to replace qemu_altgr_more.patch 7433-qemu-altgr.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=90
85 lines
3.8 KiB
Diff
85 lines
3.8 KiB
Diff
Index: xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py
|
|
===================================================================
|
|
--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConfig.py
|
|
+++ xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py
|
|
@@ -157,6 +157,7 @@ XENAPI_PLATFORM_CFG_TYPES = {
|
|
'nographic': int,
|
|
'nomigrate': int,
|
|
'pae' : int,
|
|
+ 'extid': int,
|
|
'rtc_timeoffset': int,
|
|
'parallel': str,
|
|
'serial': str,
|
|
@@ -509,6 +510,8 @@ class XendConfig(dict):
|
|
if self.is_hvm():
|
|
if 'timer_mode' not in self['platform']:
|
|
self['platform']['timer_mode'] = 1
|
|
+ if 'extid' in self['platform'] and int(self['platform']['extid']) == 1:
|
|
+ self['platform']['viridian'] = 1
|
|
if 'viridian' not in self['platform']:
|
|
self['platform']['viridian'] = 0
|
|
if 'rtc_timeoffset' not in self['platform']:
|
|
Index: xen-4.0.1-testing/tools/python/xen/xend/image.py
|
|
===================================================================
|
|
--- xen-4.0.1-testing.orig/tools/python/xen/xend/image.py
|
|
+++ xen-4.0.1-testing/tools/python/xen/xend/image.py
|
|
@@ -839,6 +839,7 @@ class HVMImageHandler(ImageHandler):
|
|
|
|
self.apic = int(vmConfig['platform'].get('apic', 0))
|
|
self.acpi = int(vmConfig['platform'].get('acpi', 0))
|
|
+ self.extid = int(vmConfig['platform'].get('extid', 0))
|
|
self.guest_os_type = vmConfig['platform'].get('guest_os_type')
|
|
self.memory_sharing = int(vmConfig['memory_sharing'])
|
|
try:
|
|
@@ -966,6 +967,7 @@ class HVMImageHandler(ImageHandler):
|
|
log.debug("target = %d", mem_mb)
|
|
log.debug("vcpus = %d", self.vm.getVCpuCount())
|
|
log.debug("vcpu_avail = %li", self.vm.getVCpuAvail())
|
|
+ log.debug("extid = %d", self.extid)
|
|
log.debug("acpi = %d", self.acpi)
|
|
log.debug("apic = %d", self.apic)
|
|
|
|
@@ -975,6 +977,7 @@ class HVMImageHandler(ImageHandler):
|
|
target = mem_mb,
|
|
vcpus = self.vm.getVCpuCount(),
|
|
vcpu_avail = self.vm.getVCpuAvail(),
|
|
+ extid = self.extid,
|
|
acpi = self.acpi,
|
|
apic = self.apic)
|
|
rc['notes'] = { 'SUSPEND_CANCEL': 1 }
|
|
Index: xen-4.0.1-testing/tools/python/xen/xm/create.py
|
|
===================================================================
|
|
--- xen-4.0.1-testing.orig/tools/python/xen/xm/create.py
|
|
+++ xen-4.0.1-testing/tools/python/xen/xm/create.py
|
|
@@ -242,6 +242,10 @@ gopts.var('viridian', val='VIRIDIAN',
|
|
use="""Expose Viridian interface to x86 HVM guest?
|
|
(Default is 0).""")
|
|
|
|
+gopts.var('extid', val='EXTID',
|
|
+ fn=set_int, default=0,
|
|
+ use="Specify extention ID for a HVM domain.")
|
|
+
|
|
gopts.var('acpi', val='ACPI',
|
|
fn=set_int, default=1,
|
|
use="Disable or enable ACPI of HVM domain.")
|
|
@@ -1091,7 +1095,7 @@ def configure_hvm(config_image, vals):
|
|
'timer_mode',
|
|
'usb', 'usbdevice',
|
|
'vcpus', 'vnc', 'vncconsole', 'vncdisplay', 'vnclisten',
|
|
- 'vncunused', 'viridian', 'vpt_align',
|
|
+ 'vncunused', 'vpt_align',
|
|
'xauthority', 'xen_extended_power_mgmt', 'xen_platform_pci',
|
|
'memory_sharing' ]
|
|
|
|
@@ -1100,6 +1104,10 @@ def configure_hvm(config_image, vals):
|
|
config_image.append([a, vals.__dict__[a]])
|
|
if vals.vncpasswd is not None:
|
|
config_image.append(['vncpasswd', vals.vncpasswd])
|
|
+ if vals.extid and vals.extid == 1:
|
|
+ config_image.append(['viridian', vals.extid])
|
|
+ elif vals.viridian:
|
|
+ config_image.append(['viridian', vals.viridian])
|
|
|
|
|
|
def make_config(vals):
|