ff4b346ede
disk fails with UnboundLocalError: local variable 'dev_type' referenced before assignment 21678-xend-mac-fix.patch - bnc#586221 - cannot add DomU with USB host controller defined domu-usb-controller.patch (Chun Yan Liu) - Upstream patches from Jan 21151-trace-bounds-check.patch 21627-cpuidle-wrap.patch 21643-vmx-vpmu-pmc-offset.patch 21682-trace-buffer-range.patch 21683-vtd-kill-timer-conditional.patch 21693-memevent-64bit-only.patch 21695-trace-t_info-readonly.patch 21698-x86-pirq-range-check.patch 21699-p2m-query-for-type-change.patch 21700-32on64-vm86-gpf.patch 21705-trace-printk.patch 21706-trace-security.patch 21712-amd-osvw.patch 21744-x86-cpufreq-range-check.patch - bnc #599550 - Xen cannot distinguish the status of 'pause' addcommand_domstate.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=63
91 lines
3.9 KiB
Diff
91 lines
3.9 KiB
Diff
--- a/tools/python/xen/lowlevel/xc/xc.c
|
|
+++ b/tools/python/xen/lowlevel/xc/xc.c
|
|
@@ -944,16 +944,16 @@ static PyObject *pyxc_hvm_build(XcObject
|
|
#endif
|
|
int i;
|
|
char *image;
|
|
- int memsize, target=-1, vcpus = 1, acpi = 0, apic = 1;
|
|
+ int memsize, target=-1, vcpus = 1, acpi = 0, apic = 1, extid = 0;
|
|
PyObject *vcpu_avail_handle = NULL;
|
|
uint8_t vcpu_avail[(HVM_MAX_VCPUS + 7)/8];
|
|
|
|
static char *kwd_list[] = { "domid",
|
|
- "memsize", "image", "target", "vcpus",
|
|
- "vcpu_avail", "acpi", "apic", NULL };
|
|
- if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iis|iiOii", kwd_list,
|
|
+ "memsize", "image", "target", "vcpus",
|
|
+ "vcpu_avail", "extid", "acpi", "apic", NULL };
|
|
+ if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iis|iiOiii", kwd_list,
|
|
&dom, &memsize, &image, &target, &vcpus,
|
|
- &vcpu_avail_handle, &acpi, &apic) )
|
|
+ &vcpu_avail_handle, &extid, &acpi, &apic) )
|
|
return NULL;
|
|
|
|
memset(vcpu_avail, 0, sizeof(vcpu_avail));
|
|
@@ -1005,6 +1005,7 @@ static PyObject *pyxc_hvm_build(XcObject
|
|
va_hvm->checksum -= sum;
|
|
munmap(va_map, XC_PAGE_SIZE);
|
|
#endif
|
|
+ xc_set_hvm_param(self->xc_handle, dom, HVM_PARAM_EXTEND_HYPERVISOR, extid);
|
|
|
|
return Py_BuildValue("{}");
|
|
}
|
|
--- a/tools/python/xen/xend/XendConfig.py
|
|
+++ b/tools/python/xen/xend/XendConfig.py
|
|
@@ -151,6 +151,7 @@ XENAPI_PLATFORM_CFG_TYPES = {
|
|
'nographic': int,
|
|
'nomigrate': int,
|
|
'pae' : int,
|
|
+ 'extid': int,
|
|
'rtc_timeoffset': int,
|
|
'parallel': str,
|
|
'serial': str,
|
|
--- a/tools/python/xen/xend/image.py
|
|
+++ b/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 }
|
|
--- a/tools/python/xen/xm/create.py
|
|
+++ b/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.")
|
|
@@ -1083,7 +1087,7 @@ def configure_hvm(config_image, vals):
|
|
'timer_mode',
|
|
'usb', 'usbdevice',
|
|
'vcpus', 'vnc', 'vncconsole', 'vncdisplay', 'vnclisten',
|
|
- 'vncunused', 'viridian', 'vpt_align',
|
|
+ 'vncunused', 'viridian', 'extid', 'vpt_align',
|
|
'xauthority', 'xen_extended_power_mgmt', 'xen_platform_pci',
|
|
'memory_sharing' ]
|
|
|