From patchwork Fri May 31 01:06:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 1107983 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45FRBY04j9z9sB8 for ; Fri, 31 May 2019 11:07:31 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 4DF4B12B5; Fri, 31 May 2019 01:07:27 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 2580F1295 for ; Fri, 31 May 2019 01:06:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 7BA656C5 for ; Fri, 31 May 2019 01:06:45 +0000 (UTC) X-Originating-IP: 76.21.119.245 Received: from ubuntu-ct.localdomain (unknown [76.21.119.245]) (Authenticated sender: jpettit@ovn.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 86E85240004 for ; Fri, 31 May 2019 01:06:37 +0000 (UTC) From: Justin Pettit To: dev@openvswitch.org Date: Thu, 30 May 2019 18:06:32 -0700 Message-Id: <20190531010632.14220-1-jpettit@ovn.org> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] Remove ESX references. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Signed-off-by: Justin Pettit Acked-by: Ben Pfaff --- configure.ac | 1 - lib/automake.mk | 6 ------ lib/dpif.h | 6 +++--- m4/openvswitch.m4 | 10 ---------- 4 files changed, 3 insertions(+), 20 deletions(-) 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(