fe31f9be81
do not understand the new PV driver protocol. - Upstream Xen version renamed to 4.0.0 in changeset 20624 & 20625. - fate#307594: HP-MCBS: XEN: support NR_CPUS=256 This is a spec file change (xen.spec) - bnc#555152 - "NAME" column in xentop (SLES11) output limited to 10 characters unlike SLES10 The update to c/s 20572 includes this fix (at c/s 20567). - Modify xen-paths.diff - Merge xend-tap-fix.patch to xen-domUloader.diff remove part of it which accepted by upstream - Load gntdev module in xend init script similar to blkbk, netbk, etc. - Backport dmmd from sles11/xen block-dmmd xen-qemu-iscsi-fix.patch xen.spec - Fix regression when create_vbd for tap xend-tap-fix.patch - Temporarily disable libxl because of libconfig dependency. - fate#302864 domUloader support lvm in disk domUloader.py Note: for test in Beta1, if not good, remove it - fate#302864 domUloader support fs on whole disk domUloader.py - Turn KMPs back on now that kernel side fix is checked in. - fate#304415 VMM: ability to switch networking mode Add vif-route-ifup to handle routed configurations using sysconfig scripts. vif-route-ifup.patch - fate#307540 USB for Xen VMs usb-add.patch - fate#305545 XEN extra descriptive field within xenstore add_des.patch - Update to Xen version 3.5.0 for the following features. fate#304226 XEN: FlexMigration feature of VT-x2 support fate#305004 Add SR-IOV PF and VF drivers to Vt-d enabled Xen fate#306830 T states in Xen controlling by MSR fate#306832 Fix for xen panic on new processors fate#306833 Westmere and Nehalem-EX: Add support for Pause Loop exiting feature for Xen fate#306835 Xen: server virtual power management enhacement fate#306837 VT-d2 - PCI SIG ATS support fate#306872 Xen: Node manager support P/T-states change when Vt-d enable fate#306873 Xen: SMP guest live migration may fail with hap=1 on NHM fate#306875 Westmere: LT-SX (Xen) fate#306891 RAS features for Xen: Add support for Machine Check and CPU/Memory online/offline features fate#307322 1GB page support in Xen fate#307324 Xen IOMMU support OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=26
58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
Index: xen-4.0.0-testing/tools/hotplug/Linux/network-bridge
|
|
===================================================================
|
|
--- xen-4.0.0-testing.orig/tools/hotplug/Linux/network-bridge
|
|
+++ xen-4.0.0-testing/tools/hotplug/Linux/network-bridge
|
|
@@ -241,6 +241,9 @@ op_start () {
|
|
return
|
|
fi
|
|
|
|
+ local bonded=""
|
|
+ [ -e /sys/class/net/${netdev}/bonding ] && bonded="yes"
|
|
+
|
|
vlans=$(find_active_vlans "${netdev}")
|
|
for vlan in $vlans ; do ifdown $vlan ; done
|
|
|
|
@@ -258,18 +261,32 @@ op_start () {
|
|
ip link set ${netdev} down
|
|
ip addr flush ${netdev}
|
|
fi
|
|
- ip link set ${netdev} name ${pdev}
|
|
- ip link set ${tdev} name ${bridge}
|
|
-
|
|
- setup_bridge_port ${pdev}
|
|
|
|
- # Restore slaves
|
|
- if [ -n "${slaves}" ]; then
|
|
- ip link set ${pdev} up
|
|
- ifenslave ${pdev} ${slaves}
|
|
+ if [ "x${bonded}" = "xyes" ]
|
|
+ then
|
|
+ ip link set ${tdev} name ${bridge}
|
|
+ ln -sf /etc/sysconfig/network/ifcfg-${netdev} /etc/sysconfig/network/ifcfg-${pdev}
|
|
+ ifup ${pdev}
|
|
+ local gw=`ip route show dev ${pdev} | fgrep default | sed 's/default via //'`
|
|
+ ip addr flush ${pdev}
|
|
+ rm -f /etc/sysconfig/network/ifcfg-${pdev}
|
|
+ brctl addif ${bridge} ${pdev}
|
|
+ ip link set ${bridge} up
|
|
+ [ -n "$gw" ] && ip route add default via ${gw}
|
|
+ else
|
|
+ ip link set ${netdev} name ${pdev}
|
|
+ ip link set ${tdev} name ${bridge}
|
|
+
|
|
+ setup_bridge_port ${pdev}
|
|
+
|
|
+ # Restore slaves
|
|
+ if [ -n "${slaves}" ]; then
|
|
+ ip link set ${pdev} up
|
|
+ ifenslave ${pdev} ${slaves}
|
|
+ fi
|
|
+ add_to_bridge2 ${bridge} ${pdev}
|
|
+ do_ifup ${bridge}
|
|
fi
|
|
- add_to_bridge2 ${bridge} ${pdev}
|
|
- do_ifup ${bridge}
|
|
|
|
for vlan in $vlans ; do ifup $vlan ; done
|
|
|