All of lore.kernel.org
 help / color / mirror / Atom feed
* [Xen-devel] [PATCH v2 0/2] [PATCH-for-4.13] Work towards removing brctl
@ 2019-12-13  4:08 Steven Haigh
  2019-12-13  4:08 ` [Xen-devel] [PATCH 1/2] Tidy up whitespace and formatting in file to be consistent Steven Haigh
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Steven Haigh @ 2019-12-13  4:08 UTC (permalink / raw)
  To: xen-devel; +Cc: Ian Jackson, Steven Haigh, Wei Liu

Start updating scripts for network functionality

(Resending as the patch emails seem to have been eaten somewhere)

The scripts for networking in Xen have a mixture of formatting,
tab spacing, space spacing inconsistencies.

We also have issues where CentOS 8 does not have brctl - being
replaced with ip / bridge commands.

This series starts cleaning up whitespace and formatting, as well
as starts adding conditionals for using brctl (if present) but using
ip if /usr/sbin/brctl is not installed.

Changes since v1
  * Fixed reference to /usr/bin/brctl instead of /usr/sbin/brctl

Steven Haigh (2):
  Tidy up whitespace and formatting in file to be consistent.
  Use ip for bridge related functions where brctl is not present

 tools/hotplug/Linux/colo-proxy-setup      |  30 +++--
 tools/hotplug/Linux/vif-bridge            |  19 ++-
 tools/hotplug/Linux/vif2                  |  12 +-
 tools/hotplug/Linux/xen-network-common.sh | 151 +++++++++++-----------
 4 files changed, 121 insertions(+), 91 deletions(-)

-- 
2.24.1

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

^ permalink raw reply	[flat|nested] 10+ messages in thread
* [Xen-devel] [PATCH 1/2] Tidy up whitespace and formatting in file to be consistent.
  2019-12-13  4:08 [Xen-devel] [PATCH v2 0/2] [PATCH-for-4.13] Work towards removing brctl Steven Haigh
@ 2019-12-13  4:08 ` Steven Haigh
  2019-12-17 14:13   ` Wei Liu
  2019-12-13  4:08 ` [Xen-devel] [PATCH 2/2] Use ip for bridge related functions where brctl is not present Steven Haigh
  2019-12-13  5:42 ` [Xen-devel] [PATCH v2 0/2] [PATCH-for-4.13] Work towards removing brctl Jürgen Groß
  2 siblings, 1 reply; 10+ messages in thread
From: Steven Haigh @ 2019-12-13  4:08 UTC (permalink / raw)
  To: xen-devel; +Cc: Ian Jackson, Steven Haigh, Wei Liu

Signed-off-by: Steven Haigh <netwiz@crc.id.au>
---
 tools/hotplug/Linux/xen-network-common.sh | 144 +++++++++++-----------
 1 file changed, 70 insertions(+), 74 deletions(-)

diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh
index 92ffa603f7..ab76827a64 100644
--- a/tools/hotplug/Linux/xen-network-common.sh
+++ b/tools/hotplug/Linux/xen-network-common.sh
@@ -26,118 +26,114 @@
 #           that the virtual device will take once the physical device has
 #           been renamed.
 
-if ! which ifup >/dev/null 2>/dev/null
-then
-  preiftransfer()
-  {
-    true
-  }
-  ifup()
-  {
-    false
-  }
-  ifdown()
-  {
-    false
-  }
+if ! which ifup >/dev/null 2>/dev/null; then
+	preiftransfer()
+	{
+		true
+	}
+	ifup()
+	{
+		false
+	}
+	ifdown()
+	{
+		false
+	}
 else
-  preiftransfer()
-  {
-    true
-  }
+	preiftransfer()
+	{
+		true
+	}
 fi
 
 
 first_file()
 {
-  t="$1"
-  shift
-  for file in $@
-  do
-    if [ "$t" "$file" ]
-    then
-      echo "$file"
-      return
-    fi
-  done
+	t="$1"
+	shift
+	for file in $@; do
+		if [ "$t" "$file" ]; then
+			echo "$file"
+			return
+		fi
+	done
 }
 
 find_dhcpd_conf_file()
 {
-  first_file -f /etc/dhcp3/dhcpd.conf /etc/dhcpd.conf
+	first_file -f /etc/dhcp3/dhcpd.conf /etc/dhcpd.conf
 }
 
 
 find_dhcpd_init_file()
 {
-  first_file -x /etc/init.d/{dhcp3-server,dhcp,dhcpd}
+	first_file -x /etc/init.d/{dhcp3-server,dhcp,dhcpd}
 }
 
 find_dhcpd_arg_file()
 {
-  first_file -f /etc/sysconfig/dhcpd /etc/defaults/dhcp /etc/default/dhcp3-server
+	first_file -f /etc/sysconfig/dhcpd /etc/defaults/dhcp /etc/default/dhcp3-server
 }
 
 # configure interfaces which act as pure bridge ports:
 _setup_bridge_port() {
-    local dev="$1"
-    local virtual="$2"
-
-    # take interface down ...
-    ip link set dev ${dev} down
-
-    if [ $virtual -ne 0 ] ; then
-        # Initialise a dummy MAC address. We choose the numerically
-        # largest non-broadcast address to prevent the address getting
-        # stolen by an Ethernet bridge for STP purposes.
-        # (FE:FF:FF:FF:FF:FF)
-        ip link set dev ${dev} address fe:ff:ff:ff:ff:ff || true
-    fi
-
-    # ... and configure it
-    ip address flush dev ${dev}
+	local dev="$1"
+	local virtual="$2"
+
+	# take interface down ...
+	ip link set dev ${dev} down
+
+	if [ $virtual -ne 0 ]; then
+		# Initialise a dummy MAC address. We choose the numerically
+		# largest non-broadcast address to prevent the address getting
+		# stolen by an Ethernet bridge for STP purposes.
+		# (FE:FF:FF:FF:FF:FF)
+		ip link set dev ${dev} address fe:ff:ff:ff:ff:ff || true
+	fi
+
+	# ... and configure it
+	ip address flush dev ${dev}
 }
 
 setup_physical_bridge_port() {
-    _setup_bridge_port $1 0
+	_setup_bridge_port $1 0
 }
 setup_virtual_bridge_port() {
-    _setup_bridge_port $1 1
+	_setup_bridge_port $1 1
 }
 
 # Usage: create_bridge bridge
 create_bridge () {
-    local bridge=$1
-
-    # 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
-    fi
+	local bridge=$1
+
+	# 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
+	fi
 }
 
 # Usage: add_to_bridge bridge dev
 add_to_bridge () {
-    local bridge=$1
-    local dev=$2
-
-    # Don't add $dev to $bridge if it's already on a bridge.
-    if [ -e "/sys/class/net/${bridge}/brif/${dev}" ]; then
-	ip link set dev ${dev} up || true
-	return
-    fi
-    brctl addif ${bridge} ${dev}
-    ip link set dev ${dev} up
+	local bridge=$1
+	local dev=$2
+
+	# Don't add $dev to $bridge if it's already on a bridge.
+	if [ -e "/sys/class/net/${bridge}/brif/${dev}" ]; then
+		ip link set dev ${dev} up || true
+		return
+	fi
+	brctl addif ${bridge} ${dev}
+	ip link set dev ${dev} up
 }
 
 # Usage: set_mtu bridge dev
 set_mtu () {
-    local bridge=$1
-    local dev=$2
-    mtu="`ip link show dev ${bridge}| awk '/mtu/ { print $5 }'`"
-    if [ -n "$mtu" ] && [ "$mtu" -gt 0 ]
-    then
-            ip link set dev ${dev} mtu $mtu || :
-    fi
+	local bridge=$1
+	local dev=$2
+	mtu="`ip link show dev ${bridge}| awk '/mtu/ { print $5 }'`"
+	if [ -n "$mtu" ] && [ "$mtu" -gt 0 ]; then
+		ip link set dev ${dev} mtu $mtu || :
+	fi
 }
-- 
2.24.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [Xen-devel] [PATCH 2/2] Use ip for bridge related functions where brctl is not present
  2019-12-13  4:08 [Xen-devel] [PATCH v2 0/2] [PATCH-for-4.13] Work towards removing brctl Steven Haigh
  2019-12-13  4:08 ` [Xen-devel] [PATCH 1/2] Tidy up whitespace and formatting in file to be consistent Steven Haigh
@ 2019-12-13  4:08 ` Steven Haigh
  2019-12-17 14:19   ` Wei Liu
  2019-12-13  5:42 ` [Xen-devel] [PATCH v2 0/2] [PATCH-for-4.13] Work towards removing brctl Jürgen Groß
  2 siblings, 1 reply; 10+ messages in thread
From: Steven Haigh @ 2019-12-13  4:08 UTC (permalink / raw)
  To: xen-devel; +Cc: Ian Jackson, Steven Haigh, Wei Liu

Signed-off-by: Steven Haigh <netwiz@crc.id.au>
---
 tools/hotplug/Linux/colo-proxy-setup      | 30 +++++++++++++++++------
 tools/hotplug/Linux/vif-bridge            | 19 ++++++++------
 tools/hotplug/Linux/vif2                  | 12 +++++++--
 tools/hotplug/Linux/xen-network-common.sh | 15 +++++++++---
 4 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/tools/hotplug/Linux/colo-proxy-setup b/tools/hotplug/Linux/colo-proxy-setup
index 94e2034452..cbd5b773c6 100755
--- a/tools/hotplug/Linux/colo-proxy-setup
+++ b/tools/hotplug/Linux/colo-proxy-setup
@@ -76,10 +76,17 @@ function teardown_primary()
 
 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
+    if [ -x "/usr/sbin/brctl" ]; then
+        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
+    else
+        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
+    fi
     do_without_error ip link set dev $forwardbr up
     do_without_error modprobe xt_SECCOLO
 
@@ -91,10 +98,17 @@ function setup_secondary()
 
 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
+    if [ -x "/usr/sbin/brctl" ]; then
+        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
+    else
+        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
+    fi
 
     do_without_error iptables -t mangle -D PREROUTING -m physdev --physdev-in \
         $vifname -j SECCOLO --index $index
diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge
index 6956dea66a..e035411934 100644
--- a/tools/hotplug/Linux/vif-bridge
+++ b/tools/hotplug/Linux/vif-bridge
@@ -31,12 +31,13 @@ dir=$(dirname "$0")
 bridge=${bridge:-}
 bridge=$(xenstore_read_default "$XENBUS_PATH/bridge" "$bridge")
 
-if [ -z "$bridge" ]
-then
-  bridge=$(brctl show | awk 'NR==2{print$1}')
-
-  if [ -z "$bridge" ]
-  then
+if [ -z "$bridge" ]; then
+    if [ -x "/usr/sbin/brctl" ]; then
+        bridge=$(brctl show | awk 'NR==2{print$1}')
+    else
+        bridge=$(bridge link | cut -d" " -f7)
+    fi
+  if [ -z "$bridge" ]; then
      fatal "Could not find bridge, and none was specified"
   fi
 else
@@ -82,7 +83,11 @@ case "$command" in
         ;;
 
     offline)
-        do_without_error brctl delif "$bridge" "$dev"
+        if [ -x "/usr/sbin/brctl"]; then
+            do_without_error brctl delif "$bridge" "$dev"
+        else
+            do_without_error ip link set "$dev" nomaster
+        fi
         do_without_error ifconfig "$dev" down
         ;;
 
diff --git a/tools/hotplug/Linux/vif2 b/tools/hotplug/Linux/vif2
index 2c155be68c..e36070cbbb 100644
--- a/tools/hotplug/Linux/vif2
+++ b/tools/hotplug/Linux/vif2
@@ -7,13 +7,21 @@ dir=$(dirname "$0")
 bridge=$(xenstore_read_default "$XENBUS_PATH/bridge" "$bridge")
 if [ -z "$bridge" ]
     then
-    nr_bridges=$(($(brctl show | cut -f 1 | grep -v "^$" | wc -l) - 1))
+    if [ -x "/usr/sbin/brctl" ]; then
+        nr_bridges=$(($(brctl show | cut -f 1 | grep -v "^$" | wc -l) - 1))
+    else
+        nr_bridges=$(bridge link | wc -l)
+    fi
     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 "
+    if [ -x "/usr/sbin/brctl" ]; then
+        bridge=$(brctl show | cut -d "
 " -f 2 | cut -f 1)
+    else
+        bridge=$(bridge link | cut -d" " -f6)
+    fi
 fi
 
 command="$1"
diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh
index ab76827a64..7833deac6c 100644
--- a/tools/hotplug/Linux/xen-network-common.sh
+++ b/tools/hotplug/Linux/xen-network-common.sh
@@ -108,9 +108,12 @@ create_bridge () {
 
 	# 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
+		if [ -x "/usr/sbin/brctl" ]; then
+			brctl addbr ${bridge}
+			brctl stp ${bridge} off
+			brctl setfd ${bridge} 0
+		else
+			ip link add name ${bridge} type bridge stp_state 0 forward_delay 0
 	fi
 }
 
@@ -124,7 +127,11 @@ add_to_bridge () {
 		ip link set dev ${dev} up || true
 		return
 	fi
-	brctl addif ${bridge} ${dev}
+	if [ -x "/usr/sbin/brctl" ]; then
+		brctl addif ${bridge} ${dev}
+	else
+		ip link set ${dev} master ${bridge}
+	fi
 	ip link set dev ${dev} up
 }
 
-- 
2.24.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* Re: [Xen-devel] [PATCH v2 0/2] [PATCH-for-4.13] Work towards removing brctl
  2019-12-13  4:08 [Xen-devel] [PATCH v2 0/2] [PATCH-for-4.13] Work towards removing brctl Steven Haigh
  2019-12-13  4:08 ` [Xen-devel] [PATCH 1/2] Tidy up whitespace and formatting in file to be consistent Steven Haigh
  2019-12-13  4:08 ` [Xen-devel] [PATCH 2/2] Use ip for bridge related functions where brctl is not present Steven Haigh
@ 2019-12-13  5:42 ` Jürgen Groß
  2 siblings, 0 replies; 10+ messages in thread
From: Jürgen Groß @ 2019-12-13  5:42 UTC (permalink / raw)
  To: Steven Haigh, xen-devel; +Cc: Ian Jackson, Wei Liu

On 13.12.19 05:08, Steven Haigh wrote:
> Start updating scripts for network functionality
> 
> (Resending as the patch emails seem to have been eaten somewhere)
> 
> The scripts for networking in Xen have a mixture of formatting,
> tab spacing, space spacing inconsistencies.
> 
> We also have issues where CentOS 8 does not have brctl - being
> replaced with ip / bridge commands.
> 
> This series starts cleaning up whitespace and formatting, as well
> as starts adding conditionals for using brctl (if present) but using
> ip if /usr/sbin/brctl is not installed.
> 
> Changes since v1
>    * Fixed reference to /usr/bin/brctl instead of /usr/sbin/brctl
> 
> Steven Haigh (2):
>    Tidy up whitespace and formatting in file to be consistent.
>    Use ip for bridge related functions where brctl is not present
> 
>   tools/hotplug/Linux/colo-proxy-setup      |  30 +++--
>   tools/hotplug/Linux/vif-bridge            |  19 ++-
>   tools/hotplug/Linux/vif2                  |  12 +-
>   tools/hotplug/Linux/xen-network-common.sh | 151 +++++++++++-----------
>   4 files changed, 121 insertions(+), 91 deletions(-)
> 

As this is no 4.13 regression its too late for the patches to make it
into 4.13, sorry.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [Xen-devel] [PATCH 1/2] Tidy up whitespace and formatting in file to be consistent.
  2019-12-13  4:08 ` [Xen-devel] [PATCH 1/2] Tidy up whitespace and formatting in file to be consistent Steven Haigh
@ 2019-12-17 14:13   ` Wei Liu
  2019-12-17 14:27     ` Wei Liu
  2019-12-17 15:44     ` Steven Haigh
  0 siblings, 2 replies; 10+ messages in thread
From: Wei Liu @ 2019-12-17 14:13 UTC (permalink / raw)
  To: Steven Haigh; +Cc: xen-devel, Ian Jackson, Wei Liu

On Fri, Dec 13, 2019 at 03:08:34PM +1100, Steven Haigh wrote:
> Signed-off-by: Steven Haigh <netwiz@crc.id.au>

Acked-by: Wei Liu <wl@xen.org>

I will need to add tools/hotplug to the subject line and the following
commit message:

   Use 4 spaces for indentation throughout the file. No functional
   change.

Wei.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [Xen-devel] [PATCH 2/2] Use ip for bridge related functions where brctl is not present
  2019-12-13  4:08 ` [Xen-devel] [PATCH 2/2] Use ip for bridge related functions where brctl is not present Steven Haigh
@ 2019-12-17 14:19   ` Wei Liu
  0 siblings, 0 replies; 10+ messages in thread
From: Wei Liu @ 2019-12-17 14:19 UTC (permalink / raw)
  To: Steven Haigh; +Cc: xen-devel, Ian Jackson, Wei Liu

On Fri, Dec 13, 2019 at 03:08:35PM +1100, Steven Haigh wrote:
> Signed-off-by: Steven Haigh <netwiz@crc.id.au>
> ---
>  tools/hotplug/Linux/colo-proxy-setup      | 30 +++++++++++++++++------
>  tools/hotplug/Linux/vif-bridge            | 19 ++++++++------
>  tools/hotplug/Linux/vif2                  | 12 +++++++--
>  tools/hotplug/Linux/xen-network-common.sh | 15 +++++++++---
>  4 files changed, 55 insertions(+), 21 deletions(-)
> 
> diff --git a/tools/hotplug/Linux/colo-proxy-setup b/tools/hotplug/Linux/colo-proxy-setup
> index 94e2034452..cbd5b773c6 100755
> --- a/tools/hotplug/Linux/colo-proxy-setup
> +++ b/tools/hotplug/Linux/colo-proxy-setup
> @@ -76,10 +76,17 @@ function teardown_primary()
>  
>  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
> +    if [ -x "/usr/sbin/brctl" ]; then

I agree with the general direction of this patch, thanks for puting
together this patch.

Instead of specifying full path here, please use `which brctl` like we
did in xen-network-common.sh.

Wei.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [Xen-devel] [PATCH 1/2] Tidy up whitespace and formatting in file to be consistent.
  2019-12-17 14:13   ` Wei Liu
@ 2019-12-17 14:27     ` Wei Liu
  2019-12-17 15:44     ` Steven Haigh
  1 sibling, 0 replies; 10+ messages in thread
From: Wei Liu @ 2019-12-17 14:27 UTC (permalink / raw)
  To: Steven Haigh; +Cc: xen-devel, Ian Jackson, Wei Liu

On Tue, Dec 17, 2019 at 02:13:30PM +0000, Wei Liu wrote:
> On Fri, Dec 13, 2019 at 03:08:34PM +1100, Steven Haigh wrote:
> > Signed-off-by: Steven Haigh <netwiz@crc.id.au>
> 
> Acked-by: Wei Liu <wl@xen.org>
> 
> I will need to add tools/hotplug to the subject line and the following
> commit message:
> 
>    Use 4 spaces for indentation throughout the file. No functional
>    change.

Actually you used tabs not spaces.

Going through other files in the same directories, they all use spaces
-- although they are as messy as this one file your modified.

While I try really hard to avoid bikeshedding space vs tab, I do want
those files to be consistent, so I will take the all-or-nothing approach
here. I probably won't commit this patch unless there is a very good
reason for it to be committed...

Wei.

> 
> Wei.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [Xen-devel] [PATCH 1/2] Tidy up whitespace and formatting in file to be consistent.
  2019-12-17 14:13   ` Wei Liu
  2019-12-17 14:27     ` Wei Liu
@ 2019-12-17 15:44     ` Steven Haigh
  2019-12-17 16:01       ` Wei Liu
  1 sibling, 1 reply; 10+ messages in thread
From: Steven Haigh @ 2019-12-17 15:44 UTC (permalink / raw)
  To: Wei Liu; +Cc: xen-devel, Ian Jackson

Ok, if its going to be 4 spaces for each file, I can batch convert & 
tidy stuff up...

The file I changed had both types, so I went with my own preference :)

If it might be a better approach, I'll sort out the majority of scripts 
in that directory - and do no function changes and post a series that 
does nothing but cleanup - then do the brctl / ip changes on top of 
that in a different patch.

I might as well do them all - and it makes sense to do nothing but 
cleanup, then functional changes based on the cleaned up code.
Steven Haigh

📧 netwiz@crc.id.au     💻 https://www.crc.id.au


On Tue, Dec 17, 2019 at 14:13, Wei Liu <wl@xen.org> wrote:
> On Fri, Dec 13, 2019 at 03:08:34PM +1100, Steven Haigh wrote:
>>  Signed-off-by: Steven Haigh <netwiz@crc.id.au>
> 
> Acked-by: Wei Liu <wl@xen.org>
> 
> I will need to add tools/hotplug to the subject line and the following
> commit message:
> 
>    Use 4 spaces for indentation throughout the file. No functional
>    change.
> 
> Wei.
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xenproject.org
> https://lists.xenproject.org/mailman/listinfo/xen-devel



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [Xen-devel] [PATCH 1/2] Tidy up whitespace and formatting in file to be consistent.
  2019-12-17 15:44     ` Steven Haigh
@ 2019-12-17 16:01       ` Wei Liu
  0 siblings, 0 replies; 10+ messages in thread
From: Wei Liu @ 2019-12-17 16:01 UTC (permalink / raw)
  To: Steven Haigh; +Cc: xen-devel, Ian Jackson, Wei Liu

On Wed, Dec 18, 2019 at 02:44:51AM +1100, Steven Haigh wrote:
> Ok, if its going to be 4 spaces for each file, I can batch convert & tidy
> stuff up...
> 
> The file I changed had both types, so I went with my own preference :)
> 
> If it might be a better approach, I'll sort out the majority of scripts in
> that directory - and do no function changes and post a series that does
> nothing but cleanup - then do the brctl / ip changes on top of that in a
> different patch.
> 

Like Juergen said on IRC, if you think that patch should be backported
(either by upstream or downstream maintainers), it will make people's
life easier if that goes in first.

Wei.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

^ permalink raw reply	[flat|nested] 10+ messages in thread
* [Xen-devel] [PATCH v2 0/2] [PATCH-for-4.13] Work towards removing brctl
@ 2019-12-13  3:04 Steven Haigh
  0 siblings, 0 replies; 10+ messages in thread
From: Steven Haigh @ 2019-12-13  3:04 UTC (permalink / raw)
  To: netwiz, xen-devel; +Cc: Ian Jackson, Wei Liu

Start updating scripts for network functionality

The scripts for networking in Xen have a mixture of formatting,
tab spacing, space spacing inconsistencies.

We also have issues where CentOS 8 does not have brctl - being
replaced with ip / bridge commands.

This series starts cleaning up whitespace and formatting, as well
as starts adding conditionals for using brctl (if present) but using
ip if /usr/sbin/brctl is not installed.

Changes since v1
  * Fixed reference to /usr/bin/brctl instead of /usr/sbin/brctl

Steven Haigh (2):
  Tidy up whitespace and formatting in file to be consistent.
  Use ip for bridge related functions where brctl is not present

 tools/hotplug/Linux/colo-proxy-setup      |  30 +++--
 tools/hotplug/Linux/vif-bridge            |  19 ++-
 tools/hotplug/Linux/vif2                  |  12 +-
 tools/hotplug/Linux/xen-network-common.sh | 151 +++++++++++-----------
 4 files changed, 121 insertions(+), 91 deletions(-)

-- 
2.24.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2019-12-17 16:02 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-13  4:08 [Xen-devel] [PATCH v2 0/2] [PATCH-for-4.13] Work towards removing brctl Steven Haigh
2019-12-13  4:08 ` [Xen-devel] [PATCH 1/2] Tidy up whitespace and formatting in file to be consistent Steven Haigh
2019-12-17 14:13   ` Wei Liu
2019-12-17 14:27     ` Wei Liu
2019-12-17 15:44     ` Steven Haigh
2019-12-17 16:01       ` Wei Liu
2019-12-13  4:08 ` [Xen-devel] [PATCH 2/2] Use ip for bridge related functions where brctl is not present Steven Haigh
2019-12-17 14:19   ` Wei Liu
2019-12-13  5:42 ` [Xen-devel] [PATCH v2 0/2] [PATCH-for-4.13] Work towards removing brctl Jürgen Groß
  -- strict thread matches above, loose matches on Subject: below --
2019-12-13  3:04 Steven Haigh

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.