Move lib/match.h to include/openvswitch directory

Signed-off-by: Ben Warren <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
zhaoxx063 · Apr 14, 2016 · e29747e · e29747e
1 parent b129cc9
commit e29747e
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 22 deletions.
diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk
@@ -6,6 +6,7 @@ openvswitchinclude_HEADERS = \
 	include/openvswitch/geneve.h \
 	include/openvswitch/list.h \
 	include/openvswitch/netdev.h \
+	include/openvswitch/match.h \
 	include/openvswitch/ofpbuf.h \
 	include/openvswitch/ofp-errors.h \
 	include/openvswitch/ofp-parse.h \

diff --git a/lib/match.h → include/openvswitch/match.h b/lib/match.h → include/openvswitch/match.h
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#ifndef MATCH_H
-#define MATCH_H 1
+#ifndef OPENVSWITCH_MATCH_H
+#define OPENVSWITCH_MATCH_H 1
 
-#include "flow.h"
-#include "packets.h"
-#include "tun-metadata.h"
+#include "openvswitch/flow.h"
+#include "openvswitch/packets.h"
+#include "openvswitch/tun-metadata.h"
 
 struct ds;
 

diff --git a/lib/automake.mk b/lib/automake.mk
@@ -115,7 +115,6 @@ lib_libopenvswitch_la_SOURCES = \
 	lib/mac-learning.c \
 	lib/mac-learning.h \
 	lib/match.c \
-	lib/match.h \
 	lib/mcast-snooping.c \
 	lib/mcast-snooping.h \
 	lib/memory.c \

diff --git a/lib/classifier.h b/lib/classifier.h
@@ -299,7 +299,7 @@
  * parallel to the rule's removal. */
 
 #include "cmap.h"
-#include "match.h"
+#include "openvswitch/match.h"
 #include "meta-flow.h"
 #include "pvector.h"
 #include "rculist.h"

diff --git a/lib/dpctl.c b/lib/dpctl.c
@@ -34,7 +34,7 @@
 #include "dpif.h"
 #include "openvswitch/dynamic-string.h"
 #include "flow.h"
-#include "match.h"
+#include "openvswitch/match.h"
 #include "netdev.h"
 #include "netdev-dpdk.h"
 #include "netlink.h"

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
@@ -45,7 +45,7 @@
 #include "hmapx.h"
 #include "latch.h"
 #include "openvswitch/list.h"
-#include "match.h"
+#include "openvswitch/match.h"
 #include "netdev.h"
 #include "netdev-dpdk.h"
 #include "netdev-vport.h"

diff --git a/lib/flow.c b/lib/flow.c
@@ -32,7 +32,7 @@
 #include "openvswitch/dynamic-string.h"
 #include "hash.h"
 #include "jhash.h"
-#include "match.h"
+#include "openvswitch/match.h"
 #include "dp-packet.h"
 #include "openflow/openflow.h"
 #include "packets.h"

diff --git a/lib/learn.c b/lib/learn.c
@@ -21,7 +21,7 @@
 #include "byte-order.h"
 #include "colors.h"
 #include "openvswitch/dynamic-string.h"
-#include "match.h"
+#include "openvswitch/match.h"
 #include "meta-flow.h"
 #include "nx-match.h"
 #include "ofp-actions.h"

diff --git a/lib/match.c b/lib/match.c
@@ -15,8 +15,9 @@
  */
 
 #include <config.h>
-#include "match.h"
+#include "openvswitch/match.h"
 #include <stdlib.h>
+#include "flow.h"
 #include "byte-order.h"
 #include "colors.h"
 #include "openvswitch/dynamic-string.h"

diff --git a/lib/ofp-util.h b/lib/ofp-util.h
@@ -24,7 +24,7 @@
 #include "compiler.h"
 #include "flow.h"
 #include "openvswitch/list.h"
-#include "match.h"
+#include "openvswitch/match.h"
 #include "meta-flow.h"
 #include "netdev.h"
 #include "openflow/netronome-ext.h"

diff --git a/lib/tun-metadata.c b/lib/tun-metadata.c
@@ -21,7 +21,7 @@
 #include "bitmap.h"
 #include "compiler.h"
 #include "hmap.h"
-#include "match.h"
+#include "openvswitch/match.h"
 #include "nx-match.h"
 #include "odp-netlink.h"
 #include "ofp-util.h"

diff --git a/ofproto/bond.c b/ofproto/bond.c
@@ -43,7 +43,7 @@
 #include "dp-packet.h"
 #include "poll-loop.h"
 #include "seq.h"
-#include "match.h"
+#include "openvswitch/match.h"
 #include "shash.h"
 #include "timeval.h"
 #include "unixctl.h"

diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h
@@ -20,7 +20,7 @@
 #include "classifier.h"
 #include "hmap.h"
 #include "openvswitch/list.h"
-#include "match.h"
+#include "openvswitch/match.h"
 #include "ofp-util.h"
 #include "ofproto.h"
 #include "ofproto-provider.h"

diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c
@@ -18,7 +18,7 @@
 #include "dirs.h"
 #include "openvswitch/dynamic-string.h"
 #include "hmap.h"
-#include "match.h"
+#include "openvswitch/match.h"
 #include "ofp-actions.h"
 #include "ofp-msgs.h"
 #include "ofp-print.h"

diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c
@@ -16,7 +16,7 @@
 #include <config.h>
 #include "physical.h"
 #include "lflow.h"
-#include "match.h"
+#include "openvswitch/match.h"
 #include "ofctrl.h"
 #include "ofp-actions.h"
 #include "openvswitch/ofpbuf.h"

diff --git a/ovn/lib/expr.c b/ovn/lib/expr.c
@@ -20,7 +20,7 @@
 #include "json.h"
 #include "lex.h"
 #include "logical-fields.h"
-#include "match.h"
+#include "openvswitch/match.h"
 #include "ofp-actions.h"
 #include "shash.h"
 #include "simap.h"

diff --git a/ovn/lib/expr.h b/ovn/lib/expr.h
@@ -56,7 +56,7 @@
 #include "lex.h"
 #include "hmap.h"
 #include "openvswitch/list.h"
-#include "match.h"
+#include "openvswitch/match.h"
 #include "meta-flow.h"
 
 struct ds;

diff --git a/tests/test-odp.c b/tests/test-odp.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include "openvswitch/dynamic-string.h"
 #include "flow.h"
-#include "match.h"
+#include "openvswitch/match.h"
 #include "openvswitch/ofpbuf.h"
 #include "ovstest.h"
 #include "util.h"

diff --git a/tests/test-ovn.c b/tests/test-ovn.c
@@ -21,7 +21,7 @@
 #include <sys/wait.h>
 #include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
-#include "match.h"
+#include "openvswitch/match.h"
 #include "ofp-actions.h"
 #include "openvswitch/ofpbuf.h"
 #include "ovn/lib/actions.h"