4cdbb395f2
grub2-x86_64-xen dependency not available xen.spec - More cleanup of README.SUSE - Update xen patch with upstream patch so that latest libvirt patch can work. (bnc#896044) + 53fcebab-xen-pass-kernel-initrd-to-qemu.patch - xen-pass-kernel-initrd-to-qemu.patch - bnc#895804 - VUL-0: CVE-2014-6268: xen: XSA-107: Mishandling of uninitialised FIFO-based event channel control blocks xsa107.patch - bnc#895802 - VUL-0: xen: XSA-106: Missing privilege level checks in x86 emulation of software interrupts xsa106.patch - bnc#895799 - VUL-0: xen: XSA-105: Missing privilege level checks in x86 HLT, LGDT, LIDT, and LMSW emulation xsa105.patch - bnc#895798 - VUL-0: xen: XSA-104: Race condition in HVMOP_track_dirty_vram xsa104.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=331
141 lines
6.2 KiB
Diff
141 lines
6.2 KiB
Diff
Index: xen-4.4.1-testing/tools/python/xen/xm/create.py
|
|
===================================================================
|
|
--- xen-4.4.1-testing.orig/tools/python/xen/xm/create.py
|
|
+++ xen-4.4.1-testing/tools/python/xen/xm/create.py
|
|
@@ -517,6 +517,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")
|
|
@@ -1048,6 +1063,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.4.1-testing/tools/python/xen/xm/xenapi_create.py
|
|
===================================================================
|
|
--- xen-4.4.1-testing.orig/tools/python/xen/xm/xenapi_create.py
|
|
+++ xen-4.4.1-testing/tools/python/xen/xm/xenapi_create.py
|
|
@@ -1074,7 +1074,9 @@ class sxp2xml:
|
|
'xen_platform_pci',
|
|
'tsc_mode'
|
|
'description',
|
|
- 'nomigrate'
|
|
+ 'nomigrate',
|
|
+ 'watchdog',
|
|
+ 'watchdog_action'
|
|
]
|
|
|
|
platform_configs = []
|
|
Index: xen-4.4.1-testing/tools/python/xen/xend/image.py
|
|
===================================================================
|
|
--- xen-4.4.1-testing.orig/tools/python/xen/xend/image.py
|
|
+++ xen-4.4.1-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.4.1-testing/tools/python/xen/xend/XendConfig.py
|
|
===================================================================
|
|
--- xen-4.4.1-testing.orig/tools/python/xen/xend/XendConfig.py
|
|
+++ xen-4.4.1-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.4.1-testing/tools/libxl/libxl_dm.c
|
|
===================================================================
|
|
--- xen-4.4.1-testing.orig/tools/libxl/libxl_dm.c
|
|
+++ xen-4.4.1-testing/tools/libxl/libxl_dm.c
|
|
@@ -252,6 +252,12 @@ static char ** libxl__build_device_model
|
|
}
|
|
}
|
|
}
|
|
+ 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);
|
|
}
|
|
@@ -596,6 +602,12 @@ static char ** libxl__build_device_model
|
|
return 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.4.1-testing/tools/libxl/libxl_types.idl
|
|
===================================================================
|
|
--- xen-4.4.1-testing.orig/tools/libxl/libxl_types.idl
|
|
+++ xen-4.4.1-testing/tools/libxl/libxl_types.idl
|
|
@@ -375,6 +375,8 @@ libxl_domain_build_info = Struct("domain
|
|
("xen_platform_pci", libxl_defbool),
|
|
("usbdevice_list", libxl_string_list),
|
|
("vendor_device", libxl_vendor_device),
|
|
+ ("watchdog", string),
|
|
+ ("watchdog_action", string),
|
|
])),
|
|
("pv", Struct(None, [("kernel", string),
|
|
("slack_memkb", MemKB),
|
|
Index: xen-4.4.1-testing/tools/libxl/xl_cmdimpl.c
|
|
===================================================================
|
|
--- xen-4.4.1-testing.orig/tools/libxl/xl_cmdimpl.c
|
|
+++ xen-4.4.1-testing/tools/libxl/xl_cmdimpl.c
|
|
@@ -1924,6 +1924,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);
|
|
|
|
if(b_info->u.hvm.vnc.listen
|
|
&& b_info->u.hvm.vnc.display
|