From d5bac2a0cfea7efc27c4f06de132460390a2e920 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Tue, 2 Mar 2010 13:52:33 -0800
Subject: [PATCH] xenserver: Suppress error message for expected non-error
 condition.

Signed-off-by: Ben Pfaff <blp@nicira.com>
---
 xenserver/etc_xensource_scripts_vif | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index 77d394004..3a209f9b4 100755
--- a/xenserver/etc_xensource_scripts_vif
+++ b/xenserver/etc_xensource_scripts_vif
@@ -172,7 +172,10 @@ remove_from_bridge()
 	    # Nothing to do
 	    ;;
 	vswitch)
-	    $vsctl del-port $dev
+            # If ovs-brcompatd is running, it might already have deleted the
+            # port.  Use --if-exists to suppress the error that would otherwise
+            # arise in that case.
+	    $vsctl -- --if-exists del-port $dev
 	    ;;
     esac
 }
-- 
2.43.0