Blob Blame History Raw
--- xen-4.11.0-rc7/tools/hotplug/Linux/colo-proxy-setup.orig	2018-06-28 08:39:45.000000000 +0100
+++ xen-4.11.0-rc7/tools/hotplug/Linux/colo-proxy-setup	2018-07-03 20:09:26.637017216 +0100
@@ -76,10 +76,10 @@
 
 function setup_secondary()
 {
-    do_without_error brctl delif $bridge $vifname
-    do_without_error brctl addbr $forwardbr
-    do_without_error brctl addif $forwardbr $vifname
-    do_without_error brctl addif $forwardbr $forwarddev
+    do_without_error ip link set $vifname nomaster
+    do_without_error ip link add name $forwardbr type bridge
+    do_without_error ip link set $vifname master $forwardbr
+    do_without_error ip link set $forwarddev master $forwardbr
     do_without_error ip link set dev $forwardbr up
     do_without_error modprobe xt_SECCOLO
 
@@ -91,10 +91,10 @@
 
 function teardown_secondary()
 {
-    do_without_error brctl delif $forwardbr $forwarddev
-    do_without_error brctl delif $forwardbr $vifname
-    do_without_error brctl delbr $forwardbr
-    do_without_error brctl addif $bridge $vifname
+    do_without_error ip link set $forwarddev nomaster
+    do_without_error ip link set $vifname nomaster
+    do_without_error ip link delete $forwardbr type bridge
+    do_without_error ip link set $vifname master $bridge
 
     do_without_error iptables -t mangle -D PREROUTING -m physdev --physdev-in \
         $vifname -j SECCOLO --index $index
--- xen-4.11.0-rc7/tools/hotplug/Linux/vif2.orig	2018-06-28 08:39:45.000000000 +0100
+++ xen-4.11.0-rc7/tools/hotplug/Linux/vif2	2018-07-03 20:11:07.558757301 +0100
@@ -7,13 +7,12 @@
 bridge=$(xenstore_read_default "$XENBUS_PATH/bridge" "$bridge")
 if [ -z "$bridge" ]
     then
-    nr_bridges=$(($(brctl show | cut -f 1 | grep -v "^$" | wc -l) - 1))
+    nr_bridges=$(bridge link | wc -l)
     if [ "$nr_bridges" != 1 ]
 	then
 	fatal "no bridge specified, and don't know which one to use ($nr_bridges found)"
     fi
-    bridge=$(brctl show | cut -d "
-" -f 2 | cut -f 1)
+    bridge=$(bridge link | cut -d" " -f10)
 fi
 
 command="$1"
--- xen-4.11.0-rc7/tools/hotplug/Linux/vif-bridge.orig	2018-07-03 19:59:18.499474117 +0100
+++ xen-4.11.0-rc7/tools/hotplug/Linux/vif-bridge	2018-07-03 20:12:31.088852864 +0100
@@ -33,7 +33,7 @@
 
 if [ -z "$bridge" ]
 then
-  bridge=$(brctl show | awk 'NR==2{print$1}')
+  bridge=$(bridge link | cut -d" " -f10)
 
   if [ -z "$bridge" ]
   then
@@ -82,7 +82,7 @@
         ;;
 
     offline)
-        do_without_error brctl delif "$bridge" "$dev"
+        do_without_error ip link set "$dev" nomaster
         do_without_error ifconfig "$dev" down
         ;;
 
--- xen-4.11.0-rc7/tools/hotplug/Linux/xen-network-common.sh.orig	2018-07-03 19:59:18.500474154 +0100
+++ xen-4.11.0-rc7/tools/hotplug/Linux/xen-network-common.sh	2018-07-03 20:16:16.466205182 +0100
@@ -111,9 +111,7 @@
 
     # Don't create the bridge if it already exists.
     if [ ! -e "/sys/class/net/${bridge}/bridge" ]; then
-	brctl addbr ${bridge}
-	brctl stp ${bridge} off
-	brctl setfd ${bridge} 0
+	ip link add name ${bridge} type bridge stp_state 0 forward_delay 0
 	# Setting these to zero stops guest<->LAN traffic
 	# traversing the bridge from hitting the *tables
 	# rulesets. guest<->host traffic still gets processed
@@ -134,7 +132,7 @@
 	ip link set dev ${dev} up || true
 	return
     fi
-    brctl addif ${bridge} ${dev}
+    ip link set ${dev} master ${bridge}
     ip link set dev ${dev} up
 }
 
--- xen-4.11.0-rc7/tools/qemu-xen-traditional/i386-dm/qemu-ifup-Linux.orig	2017-09-15 19:37:27.000000000 +0100
+++ xen-4.11.0-rc7/tools/qemu-xen-traditional/i386-dm/qemu-ifup-Linux	2018-07-03 20:17:52.934780235 +0100
@@ -34,4 +34,4 @@
 fi
 
 ifconfig $1 0.0.0.0 up
-brctl addif $bridge $1 || true
+ip link set $1 master $bridge || true