9621add6e3
support qcow2, so blktap is needed to support domains with 'tap:qcow2' disk configurations. modified tmp-initscript-modprobe.patch - bnc#809203 - xen.efi isn't signed with SUSE Secure Boot key xen.spec - Fix adding managed PCI device to an inactive domain modified xen-managed-pci-device.patch - bnc#805094 - xen hot plug attach/detach fails modified blktap-pv-cdrom.patch - bnc# 802690 - domain locking can prevent a live migration from completing modified xend-domain-lock.patch - bnc#797014 - no way to control live migrations 26675-tools-xentoollog_update_tty_detection_in_stdiostream_progress.patch xen.migrate.tools-xc_print_messages_from_xc_save_with_xc_report.patch xen.migrate.tools-xc_document_printf_calls_in_xc_restore.patch xen.migrate.tools-xc_rework_xc_save.cswitch_qemu_logdirty.patch xen.migrate.tools_set_migration_constraints_from_cmdline.patch xen.migrate.tools_add_xm_migrate_--log_progress_option.patch - Upstream patches from Jan 26585-x86-mm-Take-the-p2m-lock-even-in-shadow-mode.patch 26595-x86-nhvm-properly-clean-up-after-failure-to-set-up-all-vCPU-s.patch 26601-honor-ACPI-v4-FADT-flags.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=232
69 lines
3.0 KiB
Diff
69 lines
3.0 KiB
Diff
Index: xen-4.2.1-testing/tools/python/xen/xend/XendConfig.py
|
|
===================================================================
|
|
--- xen-4.2.1-testing.orig/tools/python/xen/xend/XendConfig.py
|
|
+++ xen-4.2.1-testing/tools/python/xen/xend/XendConfig.py
|
|
@@ -161,6 +161,7 @@ XENAPI_PLATFORM_CFG_TYPES = {
|
|
'nographic': int,
|
|
'nomigrate': int,
|
|
'pae' : int,
|
|
+ 'extid': int,
|
|
'rtc_timeoffset': int,
|
|
'parallel': str,
|
|
'serial': str,
|
|
@@ -523,6 +524,8 @@ class XendConfig(dict):
|
|
self['platform']['acpi_firmware'] = ""
|
|
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.2.1-testing/tools/python/xen/xend/image.py
|
|
===================================================================
|
|
--- xen-4.2.1-testing.orig/tools/python/xen/xend/image.py
|
|
+++ xen-4.2.1-testing/tools/python/xen/xend/image.py
|
|
@@ -830,6 +830,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:
|
|
Index: xen-4.2.1-testing/tools/python/xen/xm/create.py
|
|
===================================================================
|
|
--- xen-4.2.1-testing.orig/tools/python/xen/xm/create.py
|
|
+++ xen-4.2.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.")
|
|
@@ -1120,7 +1124,7 @@ def configure_hvm(config_image, vals):
|
|
'timer_mode',
|
|
'usb', 'usbdevice',
|
|
'vcpus', 'vnc', 'vncconsole', 'vncdisplay', 'vnclisten',
|
|
- 'vncunused', 'viridian', 'vpt_align',
|
|
+ 'vncunused', 'vpt_align',
|
|
'watchdog', 'watchdog_action',
|
|
'xauthority', 'xen_extended_power_mgmt', 'xen_platform_pci',
|
|
'memory_sharing' ]
|
|
@@ -1130,6 +1134,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):
|