diff mbox series

[ovs-dev] Remove ESX references.

Message ID 20190531010632.14220-1-jpettit@ovn.org
State Accepted
Commit e6fc4e2ce97e5b430e4bd38150cb54146296d56c
Headers show
Series [ovs-dev] Remove ESX references. | expand

Commit Message

Justin Pettit May 31, 2019, 1:06 a.m. UTC 
Signed-off-by: Justin Pettit <jpettit@ovn.org>
---
 configure.ac      |  1 -
 lib/automake.mk   |  6 ------
 lib/dpif.h        |  6 +++---
 m4/openvswitch.m4 | 10 ----------
 4 files changed, 3 insertions(+), 20 deletions(-)

Comments

Ben Pfaff May 31, 2019, 5:51 p.m. UTC | #1 
On Thu, May 30, 2019 at 06:06:32PM -0700, Justin Pettit wrote:
> Signed-off-by: Justin Pettit <jpettit@ovn.org>

As long as you build-tested it:
Acked-by: Ben Pfaff <blp@ovn.org>
Justin Pettit June 1, 2019, 5:14 p.m. UTC | #2 
> On May 31, 2019, at 10:51 AM, Ben Pfaff <blp@ovn.org> wrote:
> 
> On Thu, May 30, 2019 at 06:06:32PM -0700, Justin Pettit wrote:
>> Signed-off-by: Justin Pettit <jpettit@ovn.org>
> 
> As long as you build-tested it:
> Acked-by: Ben Pfaff <blp@ovn.org>

Thanks.  I pushed this to master.

--Justin
diff mbox series

Patch

diff --git a/configure.ac b/configure.ac
index 2dbe9a9178e3..a9f0a06dc140 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,6 @@  AC_SEARCH_LIBS([pthread_rwlock_tryrdlock], [pthread])
 AC_SEARCH_LIBS([pthread_rwlockattr_destroy], [pthread])
 AC_FUNC_STRERROR_R
 
-OVS_CHECK_ESX
 OVS_CHECK_WIN64
 OVS_CHECK_WIN32
 OVS_CHECK_VISUAL_STUDIO_DDK
diff --git a/lib/automake.mk b/lib/automake.mk
index cc5dccf39d6b..ff88c152ba4a 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -442,12 +442,6 @@  else
 lib_libopenvswitch_la_SOURCES += lib/async-append-null.c
 endif
 
-if ESX
-lib_libopenvswitch_la_SOURCES += \
-	lib/route-table-stub.c \
-	lib/if-notifier-stub.c
-endif
-
 if HAVE_IF_DL
 lib_libopenvswitch_la_SOURCES += \
 	lib/if-notifier-bsd.c \
diff --git a/lib/dpif.h b/lib/dpif.h
index 475d5a674e9a..883472a59b07 100644
--- a/lib/dpif.h
+++ b/lib/dpif.h
@@ -68,9 +68,9 @@ 
  * datapath implements these (e.g. as the Linux and netdev datapaths do), then
  * Open vSwitch's ovs-vswitchd daemon can directly control what ports are used
  * for switching.  Some datapaths might not implement them, or implement them
- * with restrictions on the types of ports that can be added or removed
- * (e.g. on ESX), on systems where port membership can only be changed by some
- * external entity.
+ * with restrictions on the types of ports that can be added or removed,
+ * on systems where port membership can only be changed by some external
+ * entity.
  *
  * Each datapath must have a port, sometimes called the "local port", whose
  * name is the same as the datapath itself, with port number 0.  The local port
diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
index b599f17d77a1..cd6b51d86c16 100644
--- a/m4/openvswitch.m4
+++ b/m4/openvswitch.m4
@@ -60,16 +60,6 @@  AC_DEFUN([OVS_CHECK_NDEBUG],
      [ndebug=false])
    AM_CONDITIONAL([NDEBUG], [test x$ndebug = xtrue])])
 
-dnl Checks for ESX.
-AC_DEFUN([OVS_CHECK_ESX],
-  [AC_CHECK_HEADER([vmware.h],
-                   [ESX=yes],
-                   [ESX=no])
-   AM_CONDITIONAL([ESX], [test "$ESX" = yes])
-   if test "$ESX" = yes; then
-      AC_DEFINE([ESX], [1], [Define to 1 if building on ESX.])
-   fi])
-
 dnl Checks for MSVC x64 compiler.
 AC_DEFUN([OVS_CHECK_WIN64],
   [AC_CACHE_CHECK(