diff --git a/block-npiv b/block-npiv index 7128935..b393bb4 100644 --- a/block-npiv +++ b/block-npiv @@ -13,48 +13,52 @@ case "$command" in add) # Params is one big arg, with fields separated by hyphens: # single path: - # FABRIC-VPWWPN-VPWWNN-TGTWWPN-LUN# + # VPWWPN-TGTWWPN-LUN# # multipath: - # {FABRIC1.FABRIC2}-{VPWWPN1.VPWWPN2.VPWWPN3}-VPWWNN-TGTWWPN-LUN# - # arg 2 - Fabric Name - # arg 3 - VPORT's WWPN - # arg 4 - VPORT's WWNN - # arg 5 - Target's WWPN - # arg 6 - LUN # on Target + # {VPWWPN1.VPWWPN2....VPWWPNx}-{TGTWWPN1.TGTWWPN2....TGTWWPNx}-LUN# + # arg 1 - VPORT's WWPN + # arg 2 - Target's WWPN + # arg 3 - LUN # on Target # no wwn contains a leading 0x - it is a 16 character hex value # You may want to optionally pick a specific adapter ? par=`xenstore-read $XENBUS_PATH/params` || true - #par=$2 - NPIVARGS=$par; - LUN=${NPIVARGS##*-*-*-*-}; NPIVARGS=${NPIVARGS%-*} - if test $LUN = $NPIVARGS ; then exit 1; fi - TGTWWPN=${NPIVARGS##*-*-*-}; NPIVARGS=${NPIVARGS%-*} - if test $TGTWWPN = $NPIVARGS ; then exit 1; fi - VPORTWWNN=${NPIVARGS##*-*-}; NPIVARGS=${NPIVARGS%-*} - if test $VPORTWWNN = $NPIVARGS ; then exit 1; fi - VPORTWWPNS=${NPIVARGS##*-}; NPIVARGS=${NPIVARGS%-*} - if test $VPORTWWPNS = $NPIVARGS ; then exit 1; fi - FABRICNMS=$NPIVARGS + NPIVARGS=(${par//-/ }) + wc=${#NPIVARGS[@]} + if [ $wc -eq 5 ]; then + # support old syntax + # FABRIC-VPWWPN-VPWWNN-TGTWWPN-LUN + VPORTWWPNS=${NPIVARGS[1]} + VPORTWWNNS=${NPIVARGS[2]} + TGTWWPNS=${NPIVARGS[3]} + LUN=${NPIVARGS[4]} + elif [ $wc -eq 3 ]; then + # new syntax + VPORTWWPNS=${NPIVARGS[0]} + TGTWWPNS=${NPIVARGS[1]} + LUN=${NPIVARGS[2]} + else + # wrong syntax + exit 1 + fi # Ensure we compare everything using lower-case hex characters - TGTWWPN=`echo $TGTWWPN | tr A-Z a-z` + TGTWWPNS=`echo $TGTWWPNS | tr A-Z a-z |sed 's/[{.}]/ /g'` VPORTWWPNS=`echo $VPORTWWPNS | tr A-Z a-z |sed 's/[{.}]/ /g'` - VPORTWWNN=`echo $VPORTWWNN | tr A-Z a-z` - FABRICNMS=`echo $FABRICNMS | tr A-Z a-z |sed 's/[{.}]/ /g'` - + # Only one VPWWNN is supported + VPORTWWNN=`echo $VPORTWWNNS | tr A-Z a-z | sed -e 's/\..*//g' -e 's/{//'` claim_lock "npiv" paths=0 - for FABRICNM in $FABRICNMS; do - for VPORTWWPN in $VPORTWWPNS; do - find_vhost $VPORTWWPN $FABRICNM - if test -z "$vhost" ; then - create_vport $FABRICNM $VPORTWWPN $VPORTWWNN - if [ $? -ne 0 ] ; then exit 2; fi - sleep 8 - find_vhost $VPORTWWPN $FABRICNM - if test -z "$vhost" ; then exit 3; fi - fi + for VPORTWWPN in $VPORTWWPNS; do + find_vhost $VPORTWWPN + if test -z "$vhost" ; then + create_vport $VPORTWWPN $VPORTWWNN + if [ $? -ne 0 ] ; then exit 2; fi + sleep 8 + find_vhost $VPORTWWPN + if test -z "$vhost" ; then exit 3; fi + fi + for TGTWWPN in $TGTWWPNS; do find_sdev $vhost $TGTWWPN $LUN if test -z "$dev"; then echo "- - -" > /sys/class/scsi_host/$vhost/scan @@ -95,18 +99,22 @@ case "$command" in # terminate the entire vport (all luns) if test $multipath = 1; then par=`xenstore-read $XENBUS_PATH/params` || true - NPIVARGS=$par; - FABRICNMS=${NPIVARGS%%-*}; NPIVARGS=${NPIVARGS#*-} - VPORTWWPNS=${NPIVARGS%%-*} + NPIVARGS=(${par//-/ }) + wc=${#NPIVARGS[@]} + if [ $wc -eq 5 ]; then + # old syntax + # FABRIC-VPWWPN-VPWWNN-TGTWWPN-LUN + VPORTWWPNS=${NPIVARGS[1]} + elif [ $wc -eq 3 ]; then + # new syntax + VPORTWWPNS=${NPIVARGS[0]} + fi VPORTWWPNS=`echo $VPORTWWPNS | tr A-Z a-z |sed 's/[{.}]/ /g'` - FABRICNMS=`echo $FABRICNMS | tr A-Z a-z |sed 's/[{.}]/ /g'` - for FABRICNM in $FABRICNMS; do - for VPORTWWPN in $VPORTWWPNS; do - find_vhost $VPORTWWPN $FABRICNM - if test -z "$vhost" ; then exit 5; fi - flush_nodes_on_vhost $vhost - delete_vhost $vhost - done + for VPORTWWPN in $VPORTWWPNS; do + find_vhost $VPORTWWPN + if test -z "$vhost" ; then exit 5; fi + flush_nodes_on_vhost $vhost + delete_vhost $vhost done else dev=$node; dev=${dev#/dev/} diff --git a/block-npiv-common.sh b/block-npiv-common.sh index 23069b5..cbffdd1 100644 --- a/block-npiv-common.sh +++ b/block-npiv-common.sh @@ -2,7 +2,6 @@ # Look for the NPIV vport with the WWPN # $1 contains the WWPN (assumes it does not contain a leading "0x") -# $2 contains the FABRICNM (assumes it does not contain "0x") find_vhost() { unset vhost @@ -15,10 +14,7 @@ find_vhost() # Note: makes the assumption the vport will always have an scsi_host child vhost=`ls -d $fchost/device/host*` vhost=`basename $vhost` - fname=`cat /sys/class/fc_host/$vhost/fabric_name | sed -e s/^0x//` - if test $fname = $2 ; then - return - fi + return fi fi done @@ -32,23 +28,27 @@ find_vhost() if test $wwpn = $1 ; then # Note: makes the assumption the vport will always have an scsi_host child vhost=`basename $fchost` - fname=`cat $fchost/fabric_name | sed -e s/^0x//` - if test $fname = $2 ; then - return - fi + return fi fi done } -# Create a NPIV vport on the fabric w/ FABRICNM, with WWPN,WWNN -# $1 contains FABRICNM -# $2 contains the VPORT WWPN -# $3 contains the VPORT WWNN +# Create a NPIV vport with WWPN +# $1 contains the VPORT WWPN +# $2 may contain the VPORT WWNN # (assumes no name contains a leading "0x") create_vport() { + wwpn=$1 + wwnn=$2 + if [ -z "$wwnn" ]; then + # auto generate wwnn, follow FluidLabUpdateForEmulex.pdf + # Novell specific identifier + # byte 6 = 0 indicates WWNN, = 1 indicates WWPN + wwnn=${wwpn:0:6}"0"${wwpn:7} + fi # find a base adapter with npiv support that is on the right fabric # Look via upstream interfaces @@ -57,14 +57,13 @@ create_vport() # is the link up, w/ NPIV support ? pstate=`cat $fchost/port_state` ptype=`cat $fchost/port_type | cut -c 1-5` - fname=`cat $fchost/fabric_name | sed -e s/^0x//` - if [ $pstate = "Online" -a $ptype = "NPort" -a $fname = $1 ] ; then + if [ $pstate = "Online" -a $ptype = "NPort" ] ; then vmax=`cat $fchost/max_npiv_vports` vinuse=`cat $fchost/npiv_vports_inuse` avail=`expr $vmax - $vinuse` if [ $avail -gt 0 ] ; then # create the vport - echo $2":"$3 > $fchost/vport_create + echo $wwpn":"$wwnn > $fchost/vport_create if [ $? -eq 0 ] ; then return 0 fi @@ -84,14 +83,13 @@ create_vport() if [ -e $fchost/port_state ] ; then pstate=`cat $fchost/port_state` ptype=`cat $fchost/port_type | cut -c 1-5` - fname=`cat $fchost/fabric_name | sed -e s/^0x//` - if [ $pstate = "Online" -a $ptype = "NPort" -a $fname = $1 ] ; then + if [ $pstate = "Online" -a $ptype = "NPort" ] ; then vmax=`cat $shost/max_npiv_vports` vinuse=`cat $shost/npiv_vports_inuse` avail=`expr $vmax - $vinuse` if [ $avail -gt 0 ] ; then # create the vport - echo $2":"$3 > $shost/vport_create + echo $wwpn":"$wwnn > $shost/vport_create if [ $? -eq 0 ] ; then return 0 fi @@ -110,10 +108,9 @@ create_vport() if [ -e $fchost/port_state ] ; then pstate=`cat $fchost/port_state` ptype=`cat $fchost/port_type | cut -c 1-5` - fname=`cat $fchost/fabric_name | sed -e s/^0x//` - if [ $pstate = "Online" -a $ptype = "NPort" -a $fname = $1 ] ; then + if [ $pstate = "Online" -a $ptype = "NPort" ] ; then # create the vport - echo $2":"$3 > $shost/vport_create + echo $wwpn":"$wwnn > $shost/vport_create if [ $? -eq 0 ] ; then return 0 fi diff --git a/libxl.honor-more-top-level-vfb-options.patch b/libxl.honor-more-top-level-vfb-options.patch new file mode 100644 index 0000000..2a2173e --- /dev/null +++ b/libxl.honor-more-top-level-vfb-options.patch @@ -0,0 +1,77 @@ +From: Wei Liu +Date: Tue, 28 Jan 2014 15:38:01 +0000 +Subject: xl: honor more top level vfb options + +Now that SDL and keymap options for VFB can also be specified in top +level options. Documentation is also updated. + +This fixes bug #31 and further possible problems. + +Signed-off-by: Wei Liu +Cc: Olaf Hering +Cc: Ian Campbell +Cc: Ian Jackson +--- + docs/man/xl.cfg.pod.5 | 4 ++-- + tools/libxl/xl_cmdimpl.c | 17 ++++++++++++++--- + 2 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 +index e15a49f..49a9250 100644 +--- a/docs/man/xl.cfg.pod.5 ++++ b/docs/man/xl.cfg.pod.5 +@@ -389,8 +389,8 @@ This options does not control the emulated graphics card presented to + an HVM guest. See L below for how to + configure the emulated device. If L options + are used in a PV guest configuration, xl will pick up B, B, +-B, B and B to construct paravirtual +-framebuffer device for the guest. ++B, B, B, B, B and ++B to construct paravirtual framebuffer device for the guest. + + Each B is a comma-separated list of C + settings, from the following list: +diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c +index 4fc46eb..28212e2 100644 +--- a/tools/libxl/xl_cmdimpl.c ++++ b/tools/libxl/xl_cmdimpl.c +@@ -721,6 +721,15 @@ static void parse_top_level_vnc_options(XLU_Config *config, + xlu_cfg_get_defbool(config, "vncunused", &vnc->findunused, 0); + } + ++static void parse_top_level_sdl_options(XLU_Config *config, ++ libxl_sdl_info *sdl) ++{ ++ xlu_cfg_get_defbool(config, "sdl", &sdl->enable, 0); ++ xlu_cfg_get_defbool(config, "opengl", &sdl->opengl, 0); ++ xlu_cfg_replace_string (config, "display", &sdl->display, 0); ++ xlu_cfg_replace_string (config, "xauthority", &sdl->xauthority, 0); ++} ++ + static void parse_config_data(const char *config_source, + const char *config_data, + int config_len, +@@ -1657,9 +1666,13 @@ skip_vfb: + libxl_device_vkb_init); + + parse_top_level_vnc_options(config, &vfb->vnc); ++ parse_top_level_sdl_options(config, &vfb->sdl); ++ xlu_cfg_replace_string (config, "keymap", &vfb->keymap, 0); + } +- } else ++ } else { + parse_top_level_vnc_options(config, &b_info->u.hvm.vnc); ++ parse_top_level_sdl_options(config, &b_info->u.hvm.sdl); ++ } + + if (c_info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (!xlu_cfg_get_string (config, "vga", &buf, 0)) { +@@ -1676,8 +1689,6 @@ skip_vfb: + LIBXL_VGA_INTERFACE_TYPE_CIRRUS; + + xlu_cfg_replace_string (config, "keymap", &b_info->u.hvm.keymap, 0); +- xlu_cfg_get_defbool(config, "sdl", &b_info->u.hvm.sdl.enable, 0); +- xlu_cfg_get_defbool(config, "opengl", &b_info->u.hvm.sdl.opengl, 0); + xlu_cfg_get_defbool (config, "spice", &b_info->u.hvm.spice.enable, 0); + if (!xlu_cfg_get_long (config, "spiceport", &l, 0)) + b_info->u.hvm.spice.port = l; diff --git a/libxl.set-migration-constraints-from-cmdline.patch b/libxl.set-migration-constraints-from-cmdline.patch index 2ad6174..184d522 100644 --- a/libxl.set-migration-constraints-from-cmdline.patch +++ b/libxl.set-migration-constraints-from-cmdline.patch @@ -74,19 +74,19 @@ v2: Signed-off-by: Olaf Hering --- - docs/man/xl.pod.1 | 20 ++++++++++++++++++++ - tools/libxc/xc_domain_save.c | 27 ++++++++++++++++++++++++-- - tools/libxc/xc_nomigrate.c | 10 +++++++++ - tools/libxc/xenguest.h | 7 +++++++ - tools/libxl/libxl.c | 27 +++++++++++++++++++++++--- - tools/libxl/libxl.h | 14 ++++++++++++++ - tools/libxl/libxl_dom.c | 1 + - tools/libxl/libxl_internal.h | 4 ++++ - tools/libxl/libxl_save_callout.c | 4 +++- - tools/libxl/libxl_save_helper.c | 4 +++- - tools/libxl/xl_cmdimpl.c | 41 ++++++++++++++++++++++++++++++++++------ - tools/libxl/xl_cmdtable.c | 23 ++++++++++++++-------- - 12 files changed, 161 insertions(+), 21 deletions(-) + docs/man/xl.pod.1 | 20 +++++++++++++++++++ + tools/libxc/xc_domain_save.c | 27 +++++++++++++++++++++++-- + tools/libxc/xc_nomigrate.c | 10 +++++++++ + tools/libxc/xenguest.h | 7 ++++++ + tools/libxl/libxl.c | 27 ++++++++++++++++++++++--- + tools/libxl/libxl.h | 15 ++++++++++++++ + tools/libxl/libxl_dom.c | 1 + tools/libxl/libxl_internal.h | 4 +++ + tools/libxl/libxl_save_callout.c | 4 ++- + tools/libxl/libxl_save_helper.c | 4 ++- + tools/libxl/xl_cmdimpl.c | 41 +++++++++++++++++++++++++++++++++------ + tools/libxl/xl_cmdtable.c | 23 ++++++++++++++------- + 12 files changed, 162 insertions(+), 21 deletions(-) Index: xen-4.4.0-testing/docs/man/xl.pod.1 =================================================================== @@ -298,7 +298,7 @@ Index: xen-4.4.0-testing/tools/libxl/libxl.h =================================================================== --- xen-4.4.0-testing.orig/tools/libxl/libxl.h +++ xen-4.4.0-testing/tools/libxl/libxl.h -@@ -687,8 +687,22 @@ int libxl_domain_suspend(libxl_ctx *ctx, +@@ -687,8 +687,23 @@ int libxl_domain_suspend(libxl_ctx *ctx, int flags, /* LIBXL_SUSPEND_* */ const libxl_asyncop_how *ao_how) LIBXL_EXTERNAL_CALLERS_ONLY; @@ -310,6 +310,7 @@ Index: xen-4.4.0-testing/tools/libxl/libxl.h + int min_remaining; +} libxl_domain_suspend_suse_properties; + ++#define LIBXL_HAVE_DOMAIN_SUSPEND_SUSE +int libxl_domain_suspend_suse(libxl_ctx *ctx, uint32_t domid, int fd, + const libxl_domain_suspend_suse_properties *props, /* optional */ + const libxl_asyncop_how *ao_how) diff --git a/local_attach_support_for_phy.patch b/local_attach_support_for_phy.patch new file mode 100644 index 0000000..fc5877b --- /dev/null +++ b/local_attach_support_for_phy.patch @@ -0,0 +1,58 @@ +commit 3bcf91cbbd9a18db9ae7d594ffde7979774ed512 +Author: Roger Pau Monne +Date: Wed Feb 12 11:15:17 2014 +0100 + + libxl: local attach support for PHY backends using scripts + + Allow disks using the PHY backend to locally attach if using a script. + + Signed-off-by: Roger Pau Monnà + Suggested-by: Ian Campbell + + +Index: xen-4.4.0-testing/tools/libxl/libxl.c +=================================================================== +--- xen-4.4.0-testing.orig/tools/libxl/libxl.c ++++ xen-4.4.0-testing/tools/libxl/libxl.c +@@ -2630,6 +2630,16 @@ void libxl__device_disk_local_initiate_a + + switch (disk->backend) { + case LIBXL_DISK_BACKEND_PHY: ++ if (disk->script != NULL) { ++ LOG(DEBUG, "trying to locally attach PHY device %s with script %s", ++ disk->pdev_path, disk->script); ++ libxl__prepare_ao_device(ao, &dls->aodev); ++ dls->aodev.callback = local_device_attach_cb; ++ device_disk_add(egc, LIBXL_TOOLSTACK_DOMID, disk, ++ &dls->aodev, libxl__alloc_vdev, ++ (void *) blkdev_start); ++ return; ++ } + LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "locally attaching PHY disk %s", + disk->pdev_path); + dev = disk->pdev_path; +@@ -2709,7 +2719,7 @@ static void local_device_attach_cb(libxl + } + + dev = GCSPRINTF("/dev/%s", disk->vdev); +- LOG(DEBUG, "locally attaching qdisk %s", dev); ++ LOG(DEBUG, "locally attached disk %s", dev); + + rc = libxl__device_from_disk(gc, LIBXL_TOOLSTACK_DOMID, disk, &device); + if (rc < 0) +@@ -2749,6 +2759,7 @@ void libxl__device_disk_local_initiate_d + if (!dls->diskpath) goto out; + + switch (disk->backend) { ++ case LIBXL_DISK_BACKEND_PHY: + case LIBXL_DISK_BACKEND_QDISK: + if (disk->vdev != NULL) { + GCNEW(device); +@@ -2766,7 +2777,6 @@ void libxl__device_disk_local_initiate_d + /* disk->vdev == NULL; fall through */ + default: + /* +- * Nothing to do for PHYSTYPE_PHY. + * For other device types assume that the blktap2 process is + * needed by the soon to be started domain and do nothing. + */ diff --git a/qemu-xen-dir-remote.tar.bz2 b/qemu-xen-dir-remote.tar.bz2 index 2d52504..c6076d8 100644 --- a/qemu-xen-dir-remote.tar.bz2 +++ b/qemu-xen-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e62addd6c9481d6b12e951dffb8474b7ccffa50a007caf7d9c9ad17fbdac4ee -size 7571602 +oid sha256:f4c30b6deacd63d74ed498ded6cdddc448c9b91a9fe90fa0490387c52723baac +size 7571312 diff --git a/qemu-xen-traditional-dir-remote.tar.bz2 b/qemu-xen-traditional-dir-remote.tar.bz2 index 9aab035..e6e5038 100644 --- a/qemu-xen-traditional-dir-remote.tar.bz2 +++ b/qemu-xen-traditional-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee8f1852348a9054add13614aa36cd5d0dc06522bad0e442bb7c6a8e1fcd871a -size 3213098 +oid sha256:1193cf071ed647d44dccc73b58574a12efeae28ed6393b9ee6cea35ad86425dc +size 3212848 diff --git a/seabios-dir-remote.tar.bz2 b/seabios-dir-remote.tar.bz2 index c6443e9..c4056e7 100644 --- a/seabios-dir-remote.tar.bz2 +++ b/seabios-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76b7b90cca79d7804cb4234ca1d403b8e4e03f103e3dcd03489541e66e611bf0 -size 366520 +oid sha256:1a64318a51031dfd03b4de2eaaed75696505a627e2eba5dd1703bb1e4100c92a +size 366380 diff --git a/xen-4.4.0-testing-src.tar.bz2 b/xen-4.4.0-testing-src.tar.bz2 index b9d98ca..5dda865 100644 --- a/xen-4.4.0-testing-src.tar.bz2 +++ b/xen-4.4.0-testing-src.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ad02731bbe8fffa1c57d5b10ddf435c01c6ecadf2a8d342660abfda1d6419d2 -size 4356222 +oid sha256:aa87fcd1134ccb8dde89b06aacb7f922d85f4a6c318af2c71b8af47d5a20c165 +size 4356476 diff --git a/xen.changes b/xen.changes index ba964bd..7a662e9 100644 --- a/xen.changes +++ b/xen.changes @@ -1,8 +1,26 @@ ------------------------------------------------------------------- -Tue Feb 17 12:33:42 MST 2014 - carnold@suse.com +Mon Mar 10 07:17:17 MDT 2014 - carnold@suse.com -- Update to Xen 4.4.0 RC4 c/s 28391 - xen-4.4.0-testing-src.tar.bz2 +- Update to Xen 4.4.0 FCS + +------------------------------------------------------------------- +Thu Mar 06 13:46:24 MST 2014 - mlatimer@suse.com + +- bnc#865682 - Local attach support for PHY backends using scripts + local_attach_support_for_phy.patch + +------------------------------------------------------------------- +Wed Feb 26 00:36:24 UTC 2014 - mlatimer@suse.com + +- bnc#798770 - Improve multipath support for npiv devices + block-npiv + block-npiv-common.sh + +------------------------------------------------------------------- +Wed Feb 19 19:56:31 CET 2014 - ohering@suse.de + +- honor global keymap= option in libxl + libxl.honor-more-top-level-vfb-options.patch ------------------------------------------------------------------- Tue Feb 11 13:27:42 MST 2014 - carnold@suse.com diff --git a/xen.spec b/xen.spec index 2f1c993..5cf61a3 100644 --- a/xen.spec +++ b/xen.spec @@ -20,7 +20,7 @@ Name: xen ExclusiveArch: %ix86 x86_64 %arm aarch64 %define xvers 4.4 %define xvermaj 4 -%define changeset 28391 +%define changeset 28401 %define xen_build_dir xen-4.4.0-testing # %define with_kmp 0 @@ -139,7 +139,7 @@ BuildRequires: xorg-x11-util-devel %endif %endif -Version: 4.4.0_04 +Version: 4.4.0_08 Release: 0 PreReq: %insserv_prereq %fillup_prereq Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel) @@ -222,6 +222,7 @@ Patch321: udev-rules.patch # Needs to go upstream Patch330: suspend_evtchn_lock.patch Patch331: xenpaging.doc.patch +Patch332: local_attach_support_for_phy.patch # Qemu traditional Patch350: blktap.patch Patch351: cdrom-removable.patch @@ -261,6 +262,7 @@ Patch384: qemu-xen-upstream-blkif-discard.patch Patch385: xen_pvonhvm.xen_emul_unplug.patch Patch386: libxc-pass-errno-to-callers-of-xc_domain_save.patch Patch387: libxl.set-migration-constraints-from-cmdline.patch +Patch388: libxl.honor-more-top-level-vfb-options.patch # Xend Patch400: xend-set-migration-constraints-from-cmdline.patch Patch402: xen.migrate.tools-xend_move_assert_to_exception_block.patch @@ -572,6 +574,7 @@ Authors: %patch321 -p1 %patch330 -p1 %patch331 -p1 +%patch332 -p1 # Qemu traditional %patch350 -p1 %patch351 -p1 @@ -611,6 +614,7 @@ Authors: %patch385 -p1 %patch386 -p1 %patch387 -p1 +%patch388 -p1 # Xend %patch400 -p1 %patch402 -p1 diff --git a/xend-tools-watchdog-support.patch b/xend-tools-watchdog-support.patch index 62cfc5a..106e29a 100644 --- a/xend-tools-watchdog-support.patch +++ b/xend-tools-watchdog-support.patch @@ -129,7 +129,7 @@ Index: xen-4.4.0-testing/tools/libxl/xl_cmdimpl.c =================================================================== --- xen-4.4.0-testing.orig/tools/libxl/xl_cmdimpl.c +++ xen-4.4.0-testing/tools/libxl/xl_cmdimpl.c -@@ -1726,6 +1726,8 @@ skip_vfb: +@@ -1737,6 +1737,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);