80e28a00ec
- unmodified_drivers: handle IRQF_SAMPLE_RANDOM, it was removed in 3.6-rc1 - bnc#778105 - first XEN-PV VM fails to spawn xend: Increase wait time for disk to appear in host bootloader Modified existing xen-domUloader.diff - Disable the snapshot patches. Snapshot only supported the qcow2 image format which was poorly implemented qemu 0.10.2. Snapshot support may be restored in the future when the newer upstream qemu is used by Xen. - bnc#776995 - attaching scsi control luns with pvscsi - xend/pvscsi: fix passing of SCSI control LUNs xen-bug776995-pvscsi-no-devname.patch - xend/pvscsi: fix usage of persistant device names for SCSI devices xen-bug776995-pvscsi-persistent-names.patch - xend/pvscsi: update sysfs parser for Linux 3.0 xen-bug776995-pvscsi-sysfs-parser.patch - Update to Xen 4.2.0 RC3+ c/s 25779 - Update to Xen 4.2.0 RC2+ c/s 25765 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=199
141 lines
6.3 KiB
Diff
141 lines
6.3 KiB
Diff
Index: xen-4.2.0-testing/tools/python/xen/xm/create.py
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/python/xen/xm/create.py
|
|
+++ xen-4.2.0-testing/tools/python/xen/xm/create.py
|
|
@@ -535,6 +535,21 @@ gopts.var('usbdevice', val='NAME',
|
|
fn=set_value, default='',
|
|
use="Name of USB device to add?")
|
|
|
|
+gopts.var('watchdog', val='NAME',
|
|
+ fn=set_value, default='',
|
|
+ use="Watchdog device to use. May be ib700 or i6300esb")
|
|
+
|
|
+gopts.var('watchdog_action', val='reset|shutdown|poweroff|pause|none|dump',
|
|
+ fn=set_value, default="reset",
|
|
+ use="""Action when watchdog timer expires:
|
|
+ - reset: Default, forcefully reset the guest;
|
|
+ - shutdown: Gracefully shutdown the guest (not recommended);
|
|
+ - poweroff: Forcefully power off the guest;
|
|
+ - pause: Pause the guest;
|
|
+ - none: Do nothing;
|
|
+ - dump: Automatically dump the guest;
|
|
+ """)
|
|
+
|
|
gopts.var('description', val='NAME',
|
|
fn=set_value, default='',
|
|
use="Description of a domain")
|
|
@@ -1097,6 +1112,7 @@ def configure_hvm(config_image, vals):
|
|
'usb', 'usbdevice',
|
|
'vcpus', 'vnc', 'vncconsole', 'vncdisplay', 'vnclisten',
|
|
'vncunused', 'viridian', 'vpt_align',
|
|
+ 'watchdog', 'watchdog_action',
|
|
'xauthority', 'xen_extended_power_mgmt', 'xen_platform_pci',
|
|
'memory_sharing' ]
|
|
|
|
Index: xen-4.2.0-testing/tools/python/xen/xm/xenapi_create.py
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/python/xen/xm/xenapi_create.py
|
|
+++ xen-4.2.0-testing/tools/python/xen/xm/xenapi_create.py
|
|
@@ -1113,7 +1113,9 @@ class sxp2xml:
|
|
'xen_platform_pci',
|
|
'tsc_mode'
|
|
'description',
|
|
- 'nomigrate'
|
|
+ 'nomigrate',
|
|
+ 'watchdog',
|
|
+ 'watchdog_action'
|
|
]
|
|
|
|
platform_configs = []
|
|
Index: xen-4.2.0-testing/tools/python/xen/xend/image.py
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/python/xen/xend/image.py
|
|
+++ xen-4.2.0-testing/tools/python/xen/xend/image.py
|
|
@@ -855,7 +855,8 @@ class HVMImageHandler(ImageHandler):
|
|
|
|
dmargs = [ 'boot', 'fda', 'fdb', 'soundhw',
|
|
'localtime', 'serial', 'stdvga', 'isa',
|
|
- 'acpi', 'usb', 'usbdevice', 'gfx_passthru' ]
|
|
+ 'acpi', 'usb', 'usbdevice', 'gfx_passthru',
|
|
+ 'watchdog', 'watchdog_action' ]
|
|
|
|
for a in dmargs:
|
|
v = vmConfig['platform'].get(a)
|
|
@@ -863,6 +864,7 @@ class HVMImageHandler(ImageHandler):
|
|
# python doesn't allow '-' in variable names
|
|
if a == 'stdvga': a = 'std-vga'
|
|
if a == 'keymap': a = 'k'
|
|
+ if a == 'watchdog_action': a = 'watchdog-action'
|
|
|
|
# Handle booleans gracefully
|
|
if a in ['localtime', 'std-vga', 'isa', 'usb', 'acpi']:
|
|
Index: xen-4.2.0-testing/tools/python/xen/xend/XendConfig.py
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/python/xen/xend/XendConfig.py
|
|
+++ xen-4.2.0-testing/tools/python/xen/xend/XendConfig.py
|
|
@@ -192,6 +192,8 @@ XENAPI_PLATFORM_CFG_TYPES = {
|
|
'xen_platform_pci': int,
|
|
"gfx_passthru": int,
|
|
'oos' : int,
|
|
+ 'watchdog': str,
|
|
+ 'watchdog_action': str,
|
|
}
|
|
|
|
# Xen API console 'other_config' keys.
|
|
Index: xen-4.2.0-testing/tools/libxl/libxl_dm.c
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/libxl/libxl_dm.c
|
|
+++ xen-4.2.0-testing/tools/libxl/libxl_dm.c
|
|
@@ -196,6 +196,12 @@ static char ** libxl__build_device_model
|
|
"-usbdevice", b_info->u.hvm.usbdevice, NULL);
|
|
}
|
|
}
|
|
+ if (b_info->u.hvm.watchdog || b_info->u.hvm.watchdog_action) {
|
|
+ flexarray_append(dm_args, "-watchdog");
|
|
+ if (b_info->u.hvm.watchdog_action) {
|
|
+ flexarray_vappend(dm_args, "-watchdog-action", b_info->u.hvm.watchdog_action, NULL);
|
|
+ }
|
|
+ }
|
|
if (b_info->u.hvm.soundhw) {
|
|
flexarray_vappend(dm_args, "-soundhw", b_info->u.hvm.soundhw, NULL);
|
|
}
|
|
@@ -449,6 +455,12 @@ static char ** libxl__build_device_model
|
|
"-usbdevice", b_info->u.hvm.usbdevice, NULL);
|
|
}
|
|
}
|
|
+ if (b_info->u.hvm.watchdog || b_info->u.hvm.watchdog_action) {
|
|
+ flexarray_append(dm_args, "-watchdog");
|
|
+ if (b_info->u.hvm.watchdog_action) {
|
|
+ flexarray_vappend(dm_args, "-watchdog-action", b_info->u.hvm.watchdog_action, NULL);
|
|
+ }
|
|
+ }
|
|
if (b_info->u.hvm.soundhw) {
|
|
flexarray_vappend(dm_args, "-soundhw", b_info->u.hvm.soundhw, NULL);
|
|
}
|
|
Index: xen-4.2.0-testing/tools/libxl/libxl_types.idl
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/libxl/libxl_types.idl
|
|
+++ xen-4.2.0-testing/tools/libxl/libxl_types.idl
|
|
@@ -319,6 +319,8 @@ libxl_domain_build_info = Struct("domain
|
|
("usbdevice", string),
|
|
("soundhw", string),
|
|
("xen_platform_pci", libxl_defbool),
|
|
+ ("watchdog", string),
|
|
+ ("watchdog_action", string),
|
|
])),
|
|
("pv", Struct(None, [("kernel", string),
|
|
("slack_memkb", MemKB),
|
|
Index: xen-4.2.0-testing/tools/libxl/xl_cmdimpl.c
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/libxl/xl_cmdimpl.c
|
|
+++ xen-4.2.0-testing/tools/libxl/xl_cmdimpl.c
|
|
@@ -1405,6 +1405,8 @@ skip_vfb:
|
|
xlu_cfg_replace_string (config, "soundhw", &b_info->u.hvm.soundhw, 0);
|
|
xlu_cfg_get_defbool(config, "xen_platform_pci",
|
|
&b_info->u.hvm.xen_platform_pci, 0);
|
|
+ xlu_cfg_replace_string (config, "watchdog", &b_info->u.hvm.watchdog, 0);
|
|
+ xlu_cfg_replace_string (config, "watchdog_action", &b_info->u.hvm.watchdog_action, 0);
|
|
}
|
|
|
|
xlu_cfg_destroy(config);
|