list: Remove lib/list.h completely.

All code is now in include/openvswitch/list.h.

Signed-off-by: Ben Warren <ben@skyportsystems.com>
Acked-by: Ryan Moats <rmoats@us.ibm.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

diff --git a/lib/automake.mk b/lib/automake.mk
index 211f3c0fc9cda0bd93deeb8386f892d496b4fa13..3eae15b658fe6230b973aca063c1d649b1b24032 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -110,7 +110,6 @@ lib_libopenvswitch_la_SOURCES = \
        lib/learn.h \
        lib/learning-switch.c \
        lib/learning-switch.h \
-       lib/list.h \
        lib/lockfile.c \
        lib/lockfile.h \
        lib/mac-learning.c \

diff --git a/lib/bfd.c b/lib/bfd.c
index c0e06af987542341e98b3aa61e8b32c860830d5e..909697f2affb7c80724db2356d25dd52bd64d6b7 100644 (file)
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -30,7 +30,7 @@
 #include "flow.h"
 #include "hash.h"
 #include "hmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "netdev.h"
 #include "odp-util.h"
 #include "ofpbuf.h"

diff --git a/lib/dp-packet.h b/lib/dp-packet.h
index bf4e7581cab36fe5a9d51e4445e9875e0ee1771f..000b09dd650c1d075b1c4f144076dffbafc0d4ac 100644 (file)
--- a/lib/dp-packet.h
+++ b/lib/dp-packet.h
@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include "list.h"
+#include "openvswitch/list.h"
 #include "packets.h"
 #include "util.h"
 #include "netdev-dpdk.h"

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index 0f2385a90eca7285f7e213443cce737056f0c0b5..85587321b7c8fb0ac72d16558dae61700bf50422 100644 (file)
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -44,7 +44,7 @@
 #include "flow.h"
 #include "hmapx.h"
 #include "latch.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "match.h"
 #include "netdev.h"
 #include "netdev-dpdk.h"

diff --git a/lib/fat-rwlock.c b/lib/fat-rwlock.c
index 89cff1d29a3323be1c50978d23de338e87345170..b36cd4cb732cc4f412296d8318d4386f3379827f 100644 (file)
--- a/lib/fat-rwlock.c
+++ b/lib/fat-rwlock.c
@@ -21,7 +21,7 @@
 #include <errno.h>
 
 #include "hmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovs-thread.h"
 #include "random.h"
 

diff --git a/lib/fat-rwlock.h b/lib/fat-rwlock.h
index 257cd563d0b890abfced64671f669a42e51d7860..181fa9238af0c668d58b3bc134be1948627ca0e7 100644 (file)
--- a/lib/fat-rwlock.h
+++ b/lib/fat-rwlock.h
@@ -18,7 +18,7 @@
 #define FAT_RWLOCK_H 1
 
 #include "compiler.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovs-thread.h"
 
 /* "Fat rwlock".

diff --git a/lib/guarded-list.h b/lib/guarded-list.h
index 3e46d513b976f0bff6e3970da14a8ba23c4b9820..80ce22c120cb92fcb691d5b54bc33eaa10a4b5b6 100644 (file)
--- a/lib/guarded-list.h
+++ b/lib/guarded-list.h
@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 #include "compiler.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovs-thread.h"
 
 struct guarded_list {

diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c
index 868dd404003e35268c3619d7f8f15ad8617059b3..33d23e1a02ad22a53c3c261ecaefd027f2ed7c95 100644 (file)
--- a/lib/jsonrpc.c
+++ b/lib/jsonrpc.c
@@ -24,7 +24,7 @@
 #include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "json.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ofpbuf.h"
 #include "ovs-thread.h"
 #include "poll-loop.h"

diff --git a/lib/list.h b/lib/list.h
deleted file mode 100644 (file)
index f641d39..0000000
--- a/lib/list.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2013, 2015 Nicira, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef LIST_H
-#define LIST_H 1
-
-/* Doubly linked list. */
-
-#include "openvswitch/list.h"
-
-#endif /* list.h */

diff --git a/lib/lldp/aa-structs.h b/lib/lldp/aa-structs.h
index 473031ef3fc34af08fd039f002c10fdf29052567..075729397a9a6e2cd7791be342bf65ef287a6b34 100644 (file)
--- a/lib/lldp/aa-structs.h
+++ b/lib/lldp/aa-structs.h
@@ -21,7 +21,7 @@
 #define AA_STRUCTS_H
 
 #include <stdint.h>
-#include "list.h"
+#include "openvswitch/list.h"
 
 struct lldp_aa_element_system_id {
     struct eth_addr system_mac;

diff --git a/lib/lldp/lldpd.c b/lib/lldp/lldpd.c
index 71f7e44b6d856b09d0cd3ca1e9d03e17d0e5bdf3..da8608309191f00ce41e2e67070cd13259664b26 100644 (file)
--- a/lib/lldp/lldpd.c
+++ b/lib/lldp/lldpd.c
@@ -39,7 +39,7 @@
 #include <sys/utsname.h>
 #endif
 #include "compiler.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "packets.h"
 #include "timeval.h"
 

diff --git a/lib/lldp/lldpd.h b/lib/lldp/lldpd.h
index c295ab4137a179a31f43ab2f378399665cd1f6df..fc2ae53c6bc213cf805c6f4b892484563b02d376 100644 (file)
--- a/lib/lldp/lldpd.h
+++ b/lib/lldp/lldpd.h
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include "dp-packet.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "lldpd-structs.h"
 #include "lldp-tlv.h"
 #include "packets.h"

diff --git a/lib/mac-learning.c b/lib/mac-learning.c
index f7c2781d5486325973beceefb3554f4c1f5b32d4..6eda1faa783eb6ca5ed5c71d31ba9d9c05eac1d2 100644 (file)
--- a/lib/mac-learning.c
+++ b/lib/mac-learning.c
@@ -23,7 +23,7 @@
 #include "bitmap.h"
 #include "coverage.h"
 #include "hash.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "poll-loop.h"
 #include "timeval.h"
 #include "unaligned.h"

diff --git a/lib/mac-learning.h b/lib/mac-learning.h
index 1f4170640193d077c5e0477663e13aa28981c7d0..0b62d09c026ac0d11747d64429e29ac2354b5ccf 100644 (file)
--- a/lib/mac-learning.h
+++ b/lib/mac-learning.h
@@ -20,7 +20,7 @@
 #include <time.h>
 #include "heap.h"
 #include "hmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovs-atomic.h"
 #include "ovs-thread.h"
 #include "packets.h"

diff --git a/lib/mcast-snooping.c b/lib/mcast-snooping.c
index ee3e2e118ba83afbebae8e72318c43044a9667b0..35600695069b3a320a5fa03c84cf5e2603a3c29b 100644 (file)
--- a/lib/mcast-snooping.c
+++ b/lib/mcast-snooping.c
@@ -26,7 +26,7 @@
 #include "byte-order.h"
 #include "coverage.h"
 #include "hash.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "poll-loop.h"
 #include "timeval.h"
 #include "entropy.h"

diff --git a/lib/mcast-snooping.h b/lib/mcast-snooping.h
index 99c314db1fc7609136686f9e98970f8b21a71f04..84b9c57a95c85ef85d12de164abadf95f0f97eb5 100644 (file)
--- a/lib/mcast-snooping.h
+++ b/lib/mcast-snooping.h
@@ -22,7 +22,7 @@
 #include <time.h>
 #include "dp-packet.h"
 #include "hmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovs-atomic.h"
 #include "ovs-thread.h"
 #include "packets.h"

diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
index 8eea788c27ab2ec89aff919a7ecd0bd6495c3fc9..aa36329525cfbe0d03de00e9036e1cfab28ace3e 100644 (file)
--- a/lib/netdev-dpdk.c
+++ b/lib/netdev-dpdk.c
@@ -34,7 +34,7 @@
 #include "dp-packet.h"
 #include "dpif-netdev.h"
 #include "fatal-signal.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "netdev-dpdk.h"
 #include "netdev-provider.h"
 #include "netdev-vport.h"

diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
index 8be1ba7900dbba799390ce022da97a025e493a57..933ecc8618845f67ab4011ad16283bd2464b7daf 100644 (file)
--- a/lib/netdev-dummy.c
+++ b/lib/netdev-dummy.c
@@ -24,7 +24,7 @@
 #include "dpif-netdev.h"
 #include "openvswitch/dynamic-string.h"
 #include "flow.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "netdev-provider.h"
 #include "netdev-vport.h"
 #include "odp-util.h"

diff --git a/lib/netdev-provider.h b/lib/netdev-provider.h
index 441962940ae8f3fd0bf3d6e06dd51c1dcea5b21e..cda25eb906232abd4c0fb56a1402ef13d550ec1b 100644 (file)
--- a/lib/netdev-provider.h
+++ b/lib/netdev-provider.h
@@ -21,7 +21,7 @@
 
 #include "connectivity.h"
 #include "netdev.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovs-numa.h"
 #include "packets.h"
 #include "seq.h"

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 2e509d3b137f10f73d1707416c0a34e7841dc83d..e398562c6973699a1a4f5c9885c21aa7410aa0a5 100644 (file)
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -36,7 +36,7 @@
 #include "flow.h"
 #include "hash.h"
 #include "hmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "netdev-provider.h"
 #include "odp-netlink.h"
 #include "dp-packet.h"

diff --git a/lib/netdev.c b/lib/netdev.c
index 95fdbc7497c4016467334071d005baf60bafc27d..47d6a8dbe4522db6a9883e485d18729b4bc8e613 100644 (file)
--- a/lib/netdev.c
+++ b/lib/netdev.c
@@ -37,7 +37,7 @@
 #include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "hash.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "netdev-dpdk.h"
 #include "netdev-provider.h"
 #include "netdev-vport.h"

diff --git a/lib/netlink-notifier.h b/lib/netlink-notifier.h
index 4bd90f1dcde56748f919e91b6b1cdd6f5f95471b..da72fc7872c6e25ea7811cc0182e789b1fc09f2e 100644 (file)
--- a/lib/netlink-notifier.h
+++ b/lib/netlink-notifier.h
@@ -20,7 +20,7 @@
 /* These functions are Linux specific, so they should be used directly only by
  * Linux-specific code. */
 
-#include "list.h"
+#include "openvswitch/list.h"
 
 struct nln;
 struct nln_notifier;

diff --git a/lib/ofp-util.h b/lib/ofp-util.h
index 31cbe2db5ccd4b6152dff7c30af47f96c96f414b..379257c41b61d8e4bf4f8cd11ee104d14a931527 100644 (file)
--- a/lib/ofp-util.h
+++ b/lib/ofp-util.h
@@ -23,7 +23,7 @@
 #include "bitmap.h"
 #include "compiler.h"
 #include "flow.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "match.h"
 #include "meta-flow.h"
 #include "netdev.h"

diff --git a/lib/ofpbuf.h b/lib/ofpbuf.h
index 0b66302b6d3090e0a5444e736a8fefac58470d97..2acca4818de43fbdc3ee7577897609f7cac808c6 100644 (file)
--- a/lib/ofpbuf.h
+++ b/lib/ofpbuf.h
@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include "list.h"
+#include "openvswitch/list.h"
 #include "util.h"
 
 struct ds;

diff --git a/lib/ovs-lldp.c b/lib/ovs-lldp.c
index 4ad74671801632271f7c55d61544731508a61f6b..b78967774fb46b87b6ecb0d714da006d6ab55df1 100644 (file)
--- a/lib/ovs-lldp.c
+++ b/lib/ovs-lldp.c
@@ -36,7 +36,7 @@
 #include <sys/types.h>
 #include "openvswitch/dynamic-string.h"
 #include "flow.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "lldp/lldpd.h"
 #include "lldp/lldpd-structs.h"
 #include "netdev.h"

diff --git a/lib/ovs-lldp.h b/lib/ovs-lldp.h
index 71dff4491392855f42f5a7a3a533fa4777f8001e..b5c3a48c9d4cce1397c1f2ddeb7835bbf21f1fd9 100644 (file)
--- a/lib/ovs-lldp.h
+++ b/lib/ovs-lldp.h
@@ -22,7 +22,7 @@
 #include <stdint.h>
 #include "dp-packet.h"
 #include "hmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "lldp/lldpd.h"
 #include "ovs-atomic.h"
 #include "packets.h"

diff --git a/lib/ovs-numa.c b/lib/ovs-numa.c
index 2765ae2db6e4a9cbf3ceb9d9db83f39916d72f7b..b92522d936183d5dd970cb7c97ef2452bada7abc 100644 (file)
--- a/lib/ovs-numa.c
+++ b/lib/ovs-numa.c
@@ -30,7 +30,7 @@
 
 #include "hash.h"
 #include "hmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovs-thread.h"
 #include "openvswitch/vlog.h"
 

diff --git a/lib/ovs-numa.h b/lib/ovs-numa.h
index 1435d3d9728df266fca23f34ff8eb82cbd1992c1..e7ff465565145a03b86831bfca96079046d020d7 100644 (file)
--- a/lib/ovs-numa.h
+++ b/lib/ovs-numa.h
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 
 #include "compiler.h"
-#include "list.h"
+#include "openvswitch/list.h"
 
 #define OVS_CORE_UNSPEC INT_MAX
 #define OVS_NUMA_UNSPEC INT_MAX

diff --git a/lib/ovs-rcu.c b/lib/ovs-rcu.c
index b8f8bc481984384dbf2e3c69b191f64816cf3599..b71b075feacd9b5ec2ce1452c7984c351c42241a 100644 (file)
--- a/lib/ovs-rcu.c
+++ b/lib/ovs-rcu.c
@@ -18,7 +18,7 @@
 #include "ovs-rcu.h"
 #include "fatal-signal.h"
 #include "guarded-list.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovs-thread.h"
 #include "poll-loop.h"
 #include "seq.h"

diff --git a/lib/ovs-thread.c b/lib/ovs-thread.c
index 1a463a727b2be36d661f3410184fa2c75cd4a8a6..dd95ab72c7faa113e45f1b46dbaba69d8f35b0ba 100644 (file)
--- a/lib/ovs-thread.c
+++ b/lib/ovs-thread.c
@@ -26,7 +26,7 @@
 #include "compiler.h"
 #include "fatal-signal.h"
 #include "hash.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "netdev-dpdk.h"
 #include "ovs-rcu.h"
 #include "poll-loop.h"

diff --git a/lib/ovsdb-idl-provider.h b/lib/ovsdb-idl-provider.h
index 190acca84bafba140ae79c5c80b1997f242ebddb..027f79bfe857b7dde6f1c821ee07a5435f981dcb 100644 (file)
--- a/lib/ovsdb-idl-provider.h
+++ b/lib/ovsdb-idl-provider.h
@@ -17,7 +17,7 @@
 #define OVSDB_IDL_PROVIDER_H 1
 
 #include "hmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovsdb-idl.h"
 #include "ovsdb-types.h"
 #include "shash.h"

diff --git a/lib/poll-loop.c b/lib/poll-loop.c
index 9e06e0fed8219323077a30af7170fb61b0b4df09..925198f0c9dd4a8e60d08a2e09b0f1e107c1e2a4 100644 (file)
--- a/lib/poll-loop.c
+++ b/lib/poll-loop.c
@@ -24,7 +24,7 @@
 #include "coverage.h"
 #include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovs-thread.h"
 #include "seq.h"
 #include "socket-util.h"

diff --git a/lib/process.c b/lib/process.c
index 7407b1e3eff7c3c1524bda74550f286770811d87..5c257ed7e808739f8073d38a34be0c8ff1a8791b 100644 (file)
--- a/lib/process.c
+++ b/lib/process.c
@@ -28,7 +28,7 @@
 #include "coverage.h"
 #include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovs-thread.h"
 #include "poll-loop.h"
 #include "signals.h"

diff --git a/lib/rstp-common.h b/lib/rstp-common.h
index 7bbee4d229344eff605023ea36256a35e9e4e723..6d5acfc4629d64164721a5879d27624702956c9e 100644 (file)
--- a/lib/rstp-common.h
+++ b/lib/rstp-common.h
@@ -34,7 +34,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "hmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovs-atomic.h"
 #include "packets.h"
 

diff --git a/lib/rtbsd.h b/lib/rtbsd.h
index d6b79f3ad772d2ca3166cfd78a49041f05665469..6676b9dcdd7f913ced8d7308dcc36e727911207d 100644 (file)
--- a/lib/rtbsd.h
+++ b/lib/rtbsd.h
@@ -18,7 +18,7 @@
 #define RTBSD_H 1
 
 #include <net/if.h>
-#include "list.h"
+#include "openvswitch/list.h"
 
 /*
  * A digested version of a message received from a PF_ROUTE socket which

diff --git a/lib/seq.c b/lib/seq.c
index 9c3257c87e2b63dd52e6b720031f7cd0ed275bce..7043405911662570e5977636fa77665aa16f0b50 100644 (file)
--- a/lib/seq.c
+++ b/lib/seq.c
@@ -24,7 +24,7 @@
 #include "hash.h"
 #include "hmap.h"
 #include "latch.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovs-thread.h"
 #include "poll-loop.h"
 

diff --git a/lib/tnl-ports.c b/lib/tnl-ports.c
index 59e5abb788886fe387f5b1fc14c39efe58def93f..0e329ecaa809ee20b5a54b31dff579ff57572050 100644 (file)
--- a/lib/tnl-ports.c
+++ b/lib/tnl-ports.c
@@ -25,7 +25,7 @@
 #include "classifier.h"
 #include "openvswitch/dynamic-string.h"
 #include "hash.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "netdev.h"
 #include "ofpbuf.h"
 #include "ovs-thread.h"

diff --git a/lib/unixctl.c b/lib/unixctl.c
index 30fcc695c21f8d402ece72cb92ac5908257e3bcb..c91dd0a9d504373c1b8edeb21d5978fa005e0fa6 100644 (file)
--- a/lib/unixctl.c
+++ b/lib/unixctl.c
@@ -23,7 +23,7 @@
 #include "openvswitch/dynamic-string.h"
 #include "json.h"
 #include "jsonrpc.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "poll-loop.h"
 #include "shash.h"
 #include "stream.h"

diff --git a/ofproto/bond.c b/ofproto/bond.c
index ab77f503c0dadb4931346cd80f47ff4316651eb3..29c075c311b79c69de3bf80f12a51eed54280820 100644 (file)
--- a/ofproto/bond.c
+++ b/ofproto/bond.c
@@ -35,7 +35,7 @@
 #include "flow.h"
 #include "hmap.h"
 #include "lacp.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "netdev.h"
 #include "odp-util.h"
 #include "ofpbuf.h"

diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h
index dfc06e34a0a43f9b28198a242ffc0bf3e9527151..637ad170ccba04f967b9e3a1189ec3a0c10d12aa 100644 (file)
--- a/ofproto/connmgr.h
+++ b/ofproto/connmgr.h
@@ -19,7 +19,7 @@
 
 #include "classifier.h"
 #include "hmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "match.h"
 #include "ofp-util.h"
 #include "ofproto.h"

diff --git a/ofproto/ofproto-dpif-ipfix.c b/ofproto/ofproto-dpif-ipfix.c
index a610c536204f1f439d84cf013a4044d29fef7dbe..9d605b2114dbf2689558c6db2cf195013cfa40cd 100644 (file)
--- a/ofproto/ofproto-dpif-ipfix.c
+++ b/ofproto/ofproto-dpif-ipfix.c
@@ -22,7 +22,7 @@
 #include "flow.h"
 #include "hash.h"
 #include "hmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ofpbuf.h"
 #include "ofproto.h"
 #include "ofproto-dpif.h"

diff --git a/ofproto/ofproto-dpif-rid.h b/ofproto/ofproto-dpif-rid.h
index 8ada5328c8173d4f87d2f043196597dd7efe6983..287663a9fa26f2e53bd76c13a62bc1b6f9646668 100644 (file)
--- a/ofproto/ofproto-dpif-rid.h
+++ b/ofproto/ofproto-dpif-rid.h
@@ -21,7 +21,7 @@
 #include <stdint.h>
 
 #include "cmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ofp-actions.h"
 #include "ofproto-dpif-mirror.h"
 #include "ovs-thread.h"

diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c
index bc316e44aea58677d2efe056f53457af779739a9..9c64b6b9f5db8d98443ed2204b12a5f4bf0fc543 100644 (file)
--- a/ofproto/ofproto-dpif-upcall.c
+++ b/ofproto/ofproto-dpif-upcall.c
@@ -27,7 +27,7 @@
 #include "fail-open.h"
 #include "guarded-list.h"
 #include "latch.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "netlink.h"
 #include "ofpbuf.h"
 #include "ofproto-dpif-ipfix.h"

diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index 19e690ec1ecbb74ab34616fba98a82fe727569d9..873b284f419c7ffa4b512a3a6929142a7fd0999e 100644 (file)
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -37,7 +37,7 @@
 #include "in-band.h"
 #include "lacp.h"
 #include "learn.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovs-lldp.h"
 #include "mac-learning.h"
 #include "mcast-snooping.h"

diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h
index 5938ba6831802d88daa3bc088c185a66c7b571f1..9373a2cb1cc32bff6e1886bcc21d1b78d9a8f3de 100644 (file)
--- a/ofproto/ofproto-provider.h
+++ b/ofproto/ofproto-provider.h
@@ -38,7 +38,7 @@
 #include "guarded-list.h"
 #include "heap.h"
 #include "hindex.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ofp-actions.h"
 #include "ofp-util.h"
 #include "ofproto/ofproto.h"

diff --git a/ovn/lib/expr.h b/ovn/lib/expr.h
index de27f09ee718a295c5cb820927111efaf7c789b8..fa7ccbebb763c1a6d268f576a067814b00a36524 100644 (file)
--- a/ovn/lib/expr.h
+++ b/ovn/lib/expr.h
@@ -55,7 +55,7 @@
 #include "classifier.h"
 #include "lex.h"
 #include "hmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "match.h"
 #include "meta-flow.h"
 

diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index 459a0dd61a2d3aed4ff52f92738144c7348a8ab9..4e2c8d0d3fb4febba6309c730260bd27bff5fa94 100644 (file)
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -33,7 +33,7 @@
 #include "json.h"
 #include "jsonrpc.h"
 #include "jsonrpc-server.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "memory.h"
 #include "monitor.h"
 #include "ovsdb.h"

diff --git a/ovsdb/ovsdb.h b/ovsdb/ovsdb.h
index 04586e7462465b333709aba90224265400918513..b3eaf15f02a642125f82848919bca84f38da98f0 100644 (file)
--- a/ovsdb/ovsdb.h
+++ b/ovsdb/ovsdb.h
@@ -18,7 +18,7 @@
 
 #include "compiler.h"
 #include "hmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "shash.h"
 
 struct json;

diff --git a/ovsdb/row.h b/ovsdb/row.h
index 62820d5a6b306b8414be40301786846256252aca..b1d1edd471041bcef13831b2aa02737089540436 100644 (file)
--- a/ovsdb/row.h
+++ b/ovsdb/row.h
@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include "column.h"
 #include "hmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovsdb-data.h"
 
 struct ovsdb_column_set;

diff --git a/ovsdb/server.h b/ovsdb/server.h
index 82c733f09cd08651bb786ac0e409897c399c8c4d..667fce992f4bc766d987516195d4d9b6fa612c31 100644 (file)
--- a/ovsdb/server.h
+++ b/ovsdb/server.h
@@ -17,7 +17,7 @@
 #define SERVER_H 1
 
 #include "hmap.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "shash.h"
 
 struct ovsdb;

diff --git a/ovsdb/transaction.c b/ovsdb/transaction.c
index 09abdcb847790ca534f8630592ee98b85b10744b..725c6f552990ac2c50a34d2903135fdc77f07e5d 100644 (file)
--- a/ovsdb/transaction.c
+++ b/ovsdb/transaction.c
@@ -22,7 +22,7 @@
 #include "hash.h"
 #include "hmap.h"
 #include "json.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovsdb-error.h"
 #include "ovsdb.h"
 #include "row.h"

diff --git a/ovsdb/trigger.h b/ovsdb/trigger.h
index 823ea9b28160a76ad61b7756cf35cd5cabb9de7e..867a28c70913acc223e1964465020978f721c0d3 100644 (file)
--- a/ovsdb/trigger.h
+++ b/ovsdb/trigger.h
@@ -16,7 +16,7 @@
 #ifndef OVSDB_TRIGGER_H
 #define OVSDB_TRIGGER_H 1
 
-#include "list.h"
+#include "openvswitch/list.h"
 
 struct ovsdb;
 

diff --git a/tests/test-list.c b/tests/test-list.c
index 5dd338565908e753c4a27e1e2c82f650db81701b..162ae9a88ebe96854c1cb735cca03db47ad3d9a4 100644 (file)
--- a/tests/test-list.c
+++ b/tests/test-list.c
@@ -15,11 +15,11 @@
  */
 
 /* A non-exhaustive test for some of the functions and macros declared in
- * list.h. */
+ * openvswitch/list.h. */
 
 #include <config.h>
 #undef NDEBUG
-#include "list.h"
+#include "openvswitch/list.h"
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index d3395714b48b76e86e3189c2ea3eb05386d07b35..e28d95dd9d8e2c40d3cff770279d8897a18db14b 100644 (file)
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -34,7 +34,7 @@
 #include "hmapx.h"
 #include "jsonrpc.h"
 #include "lacp.h"
-#include "list.h"
+#include "openvswitch/list.h"
 #include "ovs-lldp.h"
 #include "mac-learning.h"
 #include "mcast-snooping.h"