Move lib/ofp-errors.h to include/openvswitch directory

Signed-off-by: Ben Warren <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
mingyangzhang · Mar 19, 2016 · e03c096 · e03c096
1 parent b211014
commit e03c096
Show file tree

Hide file tree

Showing 30 changed files with 32 additions and 32 deletions.
diff --git a/FAQ.md b/FAQ.md
@@ -1596,7 +1596,7 @@ A: This is a Open vSwitch extension to OpenFlow error codes.  Open
    If you want to dissect the extended error message yourself, the
    format is documented in include/openflow/nicira-ext.h in the Open
    vSwitch source distribution.  The extended error codes are
-   documented in lib/ofp-errors.h.
+   documented in include/openvswitch/ofp-errors.h.
 
 Q1: Some of the traffic that I'd expect my OpenFlow controller to see
     doesn't actually appear through the OpenFlow connection, even

diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors
@@ -161,7 +161,7 @@ experimenter IDs), then ERROR_HEADER to obtain OpenFlow error number.
 It outputs a C source file for translating OpenFlow error codes into
 strings.
 
-ERROR_HEADER should point to lib/ofp-errors.h.
+ERROR_HEADER should point to include/openvswitch/ofp-errors.h.
 VENDOR_HEADER should point to include/openflow/openflow-common.h.
 The output is suitable for use as lib/ofp-errors.inc.\
 ''' % {"argv0": argv0})

diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk
@@ -3,6 +3,7 @@ openvswitchinclude_HEADERS = \
 	include/openvswitch/compiler.h \
 	include/openvswitch/geneve.h \
 	include/openvswitch/list.h \
+	include/openvswitch/ofp-errors.h \
 	include/openvswitch/thread.h \
 	include/openvswitch/token-bucket.h \
 	include/openvswitch/types.h \

diff --git a/lib/ofp-errors.h → include/openvswitch/ofp-errors.h b/lib/ofp-errors.h → include/openvswitch/ofp-errors.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef OFP_ERRORS_H
-#define OFP_ERRORS_H 1
+#ifndef OPENVSWITCH_OFP_ERRORS_H
+#define OPENVSWITCH_OFP_ERRORS_H 1
 
 #include <stdbool.h>
 #include <stddef.h>

diff --git a/lib/automake.mk b/lib/automake.mk
@@ -144,7 +144,6 @@ lib_libopenvswitch_la_SOURCES = \
 	lib/ofp-actions.c \
 	lib/ofp-actions.h \
 	lib/ofp-errors.c \
-	lib/ofp-errors.h \
 	lib/ofp-msgs.c \
 	lib/ofp-msgs.h \
 	lib/ofp-parse.c \
@@ -494,10 +493,10 @@ lib/ofp-actions.lo: lib/ofp-actions.inc1 lib/ofp-actions.inc2
 CLEANFILES += lib/ofp-actions.inc1 lib/ofp-actions.inc2
 EXTRA_DIST += build-aux/extract-ofp-actions
 
-lib/ofp-errors.inc: lib/ofp-errors.h include/openflow/openflow-common.h \
+lib/ofp-errors.inc: include/openvswitch/ofp-errors.h include/openflow/openflow-common.h \
 	$(srcdir)/build-aux/extract-ofp-errors
 	$(AM_V_GEN)$(run_python) $(srcdir)/build-aux/extract-ofp-errors \
-		$(srcdir)/lib/ofp-errors.h \
+		$(srcdir)/include/openvswitch/ofp-errors.h \
 		$(srcdir)/include/openflow/openflow-common.h > $@.tmp && \
 	mv $@.tmp $@
 lib/ofp-errors.lo: lib/ofp-errors.inc

diff --git a/lib/bundle.c b/lib/bundle.c
@@ -27,9 +27,9 @@
 #include "nx-match.h"
 #include "ofpbuf.h"
 #include "ofp-actions.h"
-#include "ofp-errors.h"
 #include "ofp-util.h"
 #include "openflow/nicira-ext.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(bundle);

diff --git a/lib/bundle.h b/lib/bundle.h
@@ -22,8 +22,8 @@
 #include <stdint.h>
 
 #include "compiler.h"
-#include "ofp-errors.h"
 #include "openflow/nicira-ext.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/types.h"
 
 struct ds;

diff --git a/lib/dpif.c b/lib/dpif.c
@@ -33,7 +33,6 @@
 #include "netlink.h"
 #include "odp-execute.h"
 #include "odp-util.h"
-#include "ofp-errors.h"
 #include "ofp-print.h"
 #include "ofp-util.h"
 #include "ofpbuf.h"
@@ -49,6 +48,7 @@
 #include "util.h"
 #include "uuid.h"
 #include "valgrind.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(dpif);

diff --git a/lib/learn.c b/lib/learn.c
@@ -25,10 +25,10 @@
 #include "meta-flow.h"
 #include "nx-match.h"
 #include "ofp-actions.h"
-#include "ofp-errors.h"
 #include "ofp-util.h"
 #include "ofpbuf.h"
 #include "openflow/openflow.h"
+#include "openvswitch/ofp-errors.h"
 #include "unaligned.h"
 
 

diff --git a/lib/learn.h b/lib/learn.h
@@ -18,7 +18,7 @@
 #define LEARN_H 1
 
 #include "compiler.h"
-#include "ofp-errors.h"
+#include "openvswitch/ofp-errors.h"
 
 struct ds;
 struct flow;

diff --git a/lib/learning-switch.c b/lib/learning-switch.c
@@ -31,7 +31,6 @@
 #include "mac-learning.h"
 #include "ofpbuf.h"
 #include "ofp-actions.h"
-#include "ofp-errors.h"
 #include "ofp-msgs.h"
 #include "ofp-parse.h"
 #include "ofp-print.h"
@@ -42,6 +41,7 @@
 #include "shash.h"
 #include "simap.h"
 #include "timeval.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/vconn.h"
 #include "openvswitch/vlog.h"
 

diff --git a/lib/meta-flow.c b/lib/meta-flow.c
@@ -26,7 +26,6 @@
 #include "classifier.h"
 #include "dynamic-string.h"
 #include "nx-match.h"
-#include "ofp-errors.h"
 #include "ofp-util.h"
 #include "ovs-thread.h"
 #include "packets.h"
@@ -36,6 +35,7 @@
 #include "tun-metadata.h"
 #include "unaligned.h"
 #include "util.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(meta_flow);

diff --git a/lib/meta-flow.h b/lib/meta-flow.h
@@ -22,7 +22,7 @@
 #include <netinet/ip6.h>
 #include "bitmap.h"
 #include "flow.h"
-#include "ofp-errors.h"
+#include "openvswitch/ofp-errors.h"
 #include "packets.h"
 #include "util.h"
 

diff --git a/lib/multipath.c b/lib/multipath.c
@@ -25,8 +25,8 @@
 #include "dynamic-string.h"
 #include "nx-match.h"
 #include "ofp-actions.h"
-#include "ofp-errors.h"
 #include "ofp-util.h"
+#include "openvswitch/ofp-errors.h"
 #include "openflow/nicira-ext.h"
 #include "packets.h"
 

diff --git a/lib/multipath.h b/lib/multipath.h
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include "compiler.h"
-#include "ofp-errors.h"
+#include "openvswitch/ofp-errors.h"
 
 struct ds;
 struct flow;

diff --git a/lib/nx-match.c b/lib/nx-match.c
@@ -26,7 +26,6 @@
 #include "hmap.h"
 #include "meta-flow.h"
 #include "ofp-actions.h"
-#include "ofp-errors.h"
 #include "ofp-util.h"
 #include "ofpbuf.h"
 #include "openflow/nicira-ext.h"
@@ -35,6 +34,7 @@
 #include "tun-metadata.h"
 #include "unaligned.h"
 #include "util.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(nx_match);

diff --git a/lib/nx-match.h b/lib/nx-match.h
@@ -23,7 +23,7 @@
 #include "compiler.h"
 #include "flow.h"
 #include "meta-flow.h"
-#include "ofp-errors.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/types.h"
 
 struct ds;

diff --git a/lib/ofp-actions.h b/lib/ofp-actions.h
@@ -20,10 +20,10 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "meta-flow.h"
-#include "ofp-errors.h"
 #include "ofp-util.h"
 #include "openflow/openflow.h"
 #include "openflow/nicira-ext.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/types.h"
 
 /* List of OVS abstracted actions.

diff --git a/lib/ofp-errors.c b/lib/ofp-errors.c
@@ -15,14 +15,14 @@
  */
 
 #include <config.h>
-#include "ofp-errors.h"
 #include <errno.h>
 #include "byte-order.h"
 #include "dynamic-string.h"
 #include "ofp-msgs.h"
 #include "ofp-util.h"
 #include "ofpbuf.h"
 #include "openflow/openflow.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(ofp_errors);

diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h
@@ -38,8 +38,8 @@
  * of headers.
  */
 
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/types.h"
-#include "ofp-errors.h"
 #include "util.h"
 
 struct ovs_list;

diff --git a/lib/ofp-print.c b/lib/ofp-print.c
@@ -39,11 +39,11 @@
 #include "nx-match.h"
 #include "ofp-actions.h"
 #include "ofpbuf.h"
-#include "ofp-errors.h"
 #include "ofp-msgs.h"
 #include "ofp-util.h"
 #include "openflow/openflow.h"
 #include "openflow/nicira-ext.h"
+#include "openvswitch/ofp-errors.h"
 #include "packets.h"
 #include "dp-packet.h"
 #include "type-props.h"

diff --git a/lib/ofp-prop.c b/lib/ofp-prop.c
@@ -20,7 +20,7 @@
 
 #include "byte-order.h"
 #include "ofpbuf.h"
-#include "ofp-errors.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/vlog.h"
 #include "util.h"
 #include "uuid.h"

diff --git a/lib/ofp-prop.h b/lib/ofp-prop.h
@@ -49,7 +49,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include "ofp-errors.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/types.h"
 
 struct ofpbuf;

diff --git a/lib/ofp-util.c b/lib/ofp-util.c
@@ -34,7 +34,6 @@
 #include "nx-match.h"
 #include "id-pool.h"
 #include "ofp-actions.h"
-#include "ofp-errors.h"
 #include "ofp-msgs.h"
 #include "ofp-prop.h"
 #include "ofp-util.h"
@@ -46,6 +45,7 @@
 #include "tun-metadata.h"
 #include "unaligned.h"
 #include "type-props.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/vlog.h"
 #include "bitmap.h"
 

diff --git a/lib/pktbuf.h b/lib/pktbuf.h
@@ -20,7 +20,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "ofp-errors.h"
+#include "openvswitch/ofp-errors.h"
 
 struct pktbuf;
 struct dp_packet;

diff --git a/lib/vconn.c b/lib/vconn.c
@@ -26,7 +26,6 @@
 #include "dynamic-string.h"
 #include "fatal-signal.h"
 #include "flow.h"
-#include "ofp-errors.h"
 #include "ofp-msgs.h"
 #include "ofp-print.h"
 #include "ofp-util.h"
@@ -37,6 +36,7 @@
 #include "poll-loop.h"
 #include "random.h"
 #include "util.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/vlog.h"
 #include "socket-util.h"
 

diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h
@@ -21,11 +21,11 @@
 #include "hmap.h"
 #include "list.h"
 #include "match.h"
-#include "ofp-errors.h"
 #include "ofp-util.h"
 #include "ofproto.h"
 #include "ofproto-provider.h"
 #include "openflow/nicira-ext.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/types.h"
 
 struct nlattr;

diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h
@@ -40,9 +40,9 @@
 #include "hindex.h"
 #include "list.h"
 #include "ofp-actions.h"
-#include "ofp-errors.h"
 #include "ofp-util.h"
 #include "ofproto/ofproto.h"
+#include "openvswitch/ofp-errors.h"
 #include "ovs-atomic.h"
 #include "ovs-rcu.h"
 #include "ovs-thread.h"

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
@@ -35,7 +35,6 @@
 #include "netdev.h"
 #include "nx-match.h"
 #include "ofp-actions.h"
-#include "ofp-errors.h"
 #include "ofp-msgs.h"
 #include "ofp-print.h"
 #include "ofp-util.h"
@@ -59,6 +58,7 @@
 #include "tun-metadata.h"
 #include "unaligned.h"
 #include "unixctl.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/vlog.h"
 #include "bundles.h"
 

diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
@@ -41,7 +41,6 @@
 #include "nx-match.h"
 #include "odp-util.h"
 #include "ofp-actions.h"
-#include "ofp-errors.h"
 #include "ofp-msgs.h"
 #include "ofp-parse.h"
 #include "ofp-print.h"
@@ -61,6 +60,7 @@
 #include "timeval.h"
 #include "unixctl.h"
 #include "util.h"
+#include "openvswitch/ofp-errors.h"
 #include "openvswitch/vconn.h"
 #include "openvswitch/vlog.h"
 #include "meta-flow.h"