rpm/xen
SHA256
1
0
Fork 0
forked from pool/xen
Code Pull Requests Activity

- Update to Xen 4.2.0 FCS c/s 25844

Browse Source 
- 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
This commit is contained in:
Charles Arnold
2012-09-17 15:49:23 +00:00
committed by Git OBS Bridge
parent 396bc537b5
commit 80e28a00ec
347 changed files with 1552 additions and 41499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
tools-watchdog-support.patch
View File

@@ -1,7 +1,7 @@
Index: xen-4.1.3-testing/tools/python/xen/xm/create.py
Index: xen-4.2.0-testing/tools/python/xen/xm/create.py
===================================================================
--- xen-4.1.3-testing.orig/tools/python/xen/xm/create.py
+++ xen-4.1.3-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?")
@@ -24,7 +24,7 @@ Index: xen-4.1.3-testing/tools/python/xen/xm/create.py
gopts.var('description', val='NAME',
fn=set_value, default='',
use="Description of a domain")
@@ -1092,6 +1107,7 @@ def configure_hvm(config_image, vals):
@@ -1097,6 +1112,7 @@ def configure_hvm(config_image, vals):
'usb', 'usbdevice',
'vcpus', 'vnc', 'vncconsole', 'vncdisplay', 'vnclisten',
'vncunused', 'viridian', 'vpt_align',
@@ -32,10 +32,10 @@ Index: xen-4.1.3-testing/tools/python/xen/xm/create.py
'xauthority', 'xen_extended_power_mgmt', 'xen_platform_pci',
'memory_sharing' ]
Index: xen-4.1.3-testing/tools/python/xen/xm/xenapi_create.py
Index: xen-4.2.0-testing/tools/python/xen/xm/xenapi_create.py
===================================================================
--- xen-4.1.3-testing.orig/tools/python/xen/xm/xenapi_create.py
+++ xen-4.1.3-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'
@@ -47,11 +47,11 @@ Index: xen-4.1.3-testing/tools/python/xen/xm/xenapi_create.py
]
platform_configs = []
Index: xen-4.1.3-testing/tools/python/xen/xend/image.py
Index: xen-4.2.0-testing/tools/python/xen/xend/image.py
===================================================================
--- xen-4.1.3-testing.orig/tools/python/xen/xend/image.py
+++ xen-4.1.3-testing/tools/python/xen/xend/image.py
@@ -866,7 +866,8 @@ class HVMImageHandler(ImageHandler):
--- 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',
@@ -61,7 +61,7 @@ Index: xen-4.1.3-testing/tools/python/xen/xend/image.py
for a in dmargs:
v = vmConfig['platform'].get(a)
@@ -874,6 +875,7 @@ class HVMImageHandler(ImageHandler):
@@ -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'
@@ -69,11 +69,11 @@ Index: xen-4.1.3-testing/tools/python/xen/xend/image.py
# Handle booleans gracefully
if a in ['localtime', 'std-vga', 'isa', 'usb', 'acpi']:
Index: xen-4.1.3-testing/tools/python/xen/xend/XendConfig.py
Index: xen-4.2.0-testing/tools/python/xen/xend/XendConfig.py
===================================================================
--- xen-4.1.3-testing.orig/tools/python/xen/xend/XendConfig.py
+++ xen-4.1.3-testing/tools/python/xen/xend/XendConfig.py
@@ -191,6 +191,8 @@ XENAPI_PLATFORM_CFG_TYPES = {
--- 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,
@@ -82,68 +82,59 @@ Index: xen-4.1.3-testing/tools/python/xen/xend/XendConfig.py
}
# Xen API console 'other_config' keys.
Index: xen-4.1.3-testing/tools/libxl/libxl_dm.c
Index: xen-4.2.0-testing/tools/libxl/libxl_dm.c
===================================================================
--- xen-4.1.3-testing.orig/tools/libxl/libxl_dm.c
+++ xen-4.1.3-testing/tools/libxl/libxl_dm.c
@@ -117,6 +117,12 @@ static char ** libxl_build_device_model_
flexarray_vappend(dm_args, "-usbdevice", info->usbdevice, NULL);
--- 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 (info->watchdog || info->watchdog_action) {
+ if (b_info->u.hvm.watchdog || b_info->u.hvm.watchdog_action) {
+ flexarray_append(dm_args, "-watchdog");
+ if (info->watchdog_action) {
+ flexarray_vappend(dm_args, "-watchdog-action", info->watchdog_action, NULL);
+ if (b_info->u.hvm.watchdog_action) {
+ flexarray_vappend(dm_args, "-watchdog-action", b_info->u.hvm.watchdog_action, NULL);
+ }
+ }
if (info->soundhw) {
flexarray_vappend(dm_args, "-soundhw", info->soundhw, NULL);
if (b_info->u.hvm.soundhw) {
flexarray_vappend(dm_args, "-soundhw", b_info->u.hvm.soundhw, NULL);
}
@@ -253,6 +259,12 @@ static char ** libxl_build_device_model_
flexarray_vappend(dm_args, "-usbdevice", info->usbdevice, NULL);
@@ -449,6 +455,12 @@ static char ** libxl__build_device_model
"-usbdevice", b_info->u.hvm.usbdevice, NULL);
}
}
+ if (info->watchdog || info->watchdog_action) {
+ if (b_info->u.hvm.watchdog || b_info->u.hvm.watchdog_action) {
+ flexarray_append(dm_args, "-watchdog");
+ if (info->watchdog_action) {
+ flexarray_vappend(dm_args, "-watchdog-action", info->watchdog_action, NULL);
+ if (b_info->u.hvm.watchdog_action) {
+ flexarray_vappend(dm_args, "-watchdog-action", b_info->u.hvm.watchdog_action, NULL);
+ }
+ }
if (info->soundhw) {
flexarray_vappend(dm_args, "-soundhw", info->soundhw, NULL);
if (b_info->u.hvm.soundhw) {
flexarray_vappend(dm_args, "-soundhw", b_info->u.hvm.soundhw, NULL);
}
Index: xen-4.1.3-testing/tools/libxl/libxl.idl
Index: xen-4.2.0-testing/tools/libxl/libxl_types.idl
===================================================================
--- xen-4.1.3-testing.orig/tools/libxl/libxl.idl
+++ xen-4.1.3-testing/tools/libxl/libxl.idl
@@ -166,6 +166,8 @@ libxl_device_model_info = Struct("device
("vcpu_avail", integer, False, "vcpus actually available"),
("xen_platform_pci", integer, False, "enable/disable the xen platform pci device"),
("extra", libxl_string_list, False, "extra parameters pass directly to qemu, NULL terminated"),
+ ("watchdog", string, False, "the watchdog device, ib700 or i6300esb"),
+ ("watchdog_action", string, False, "action to take when the watchdog timer expires"),
],
comment=
"""Device Model information.
Index: xen-4.1.3-testing/tools/libxl/xl_cmdimpl.c
--- 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.1.3-testing.orig/tools/libxl/xl_cmdimpl.c
+++ xen-4.1.3-testing/tools/libxl/xl_cmdimpl.c
@@ -365,6 +365,8 @@ static void printf_info(int domid,
printf("\t\t\t(usb %d)\n", dm_info->usb);
printf("\t\t\t(usbdevice %s)\n", dm_info->usbdevice);
printf("\t\t\t(apic %d)\n", dm_info->apic);
+ printf("\t\t\t(watchdog %s)\n", dm_info->watchdog);
+ printf("\t\t\t(watchdog_action %s)\n", dm_info->watchdog_action);
printf("\t\t)\n");
} else {
printf("\t\t(linux %d)\n", b_info->hvm);
@@ -1158,6 +1160,8 @@ skip_vfb:
xlu_cfg_replace_string (config, "soundhw", &dm_info->soundhw);
if (!xlu_cfg_get_long (config, "xen_platform_pci", &l))
dm_info->xen_platform_pci = l;
+ xlu_cfg_replace_string (config, "watchdog", &dm_info->watchdog);
+ xlu_cfg_replace_string (config, "watchdog_action", &dm_info->watchdog_action);
--- 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);
}
if (!xlu_cfg_get_list(config, "device_model_args", &dmargs, &nr_dmargs, 0))
{
xlu_cfg_destroy(config);