From ee89ea7b477bb4fd05137de03b2e8443807ed9f4 Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Tue, 12 Jul 2016 16:37:34 -0500 Subject: [PATCH] json: Move from lib to include/openvswitch. To easily allow both in- and out-of-tree building of the Python wrapper for the OVS JSON parser (e.g. w/ pip), move json.h to include/openvswitch. This also requires moving lib/{hmap,shash}.h. Both hmap.h and shash.h were #include-ing "util.h" even though the headers themselves did not use anything from there, but rather from include/openvswitch/util.h. Fixing that required including util.h in several C files mostly due to OVS_NOT_REACHED and things like xmalloc. Signed-off-by: Terry Wilson Signed-off-by: Ben Pfaff --- include/openvswitch/automake.mk | 3 +++ {lib => include/openvswitch}/hmap.h | 2 +- {lib => include/openvswitch}/json.h | 3 ++- {lib => include/openvswitch}/shash.h | 4 ++-- lib/automake.mk | 3 --- lib/bfd.c | 2 +- lib/bundle.c | 1 + lib/cfm.c | 3 ++- lib/cfm.h | 2 +- lib/db-ctl-base.c | 4 ++-- lib/db-ctl-base.h | 2 +- lib/dpctl.c | 2 +- lib/dpif-netdev.c | 2 +- lib/dpif-netlink.c | 2 +- lib/dpif.c | 2 +- lib/fat-rwlock.c | 2 +- lib/fatal-signal.c | 2 +- lib/flow.c | 1 + lib/hmap.c | 2 +- lib/hmapx.h | 2 +- lib/id-pool.c | 2 +- lib/json.c | 4 ++-- lib/jsonrpc.c | 2 +- lib/lacp.c | 5 +++-- lib/learning-switch.c | 4 ++-- lib/lockfile.c | 2 +- lib/mac-learning.h | 2 +- lib/mcast-snooping.h | 2 +- lib/meta-flow.c | 2 +- lib/multipath.c | 1 + lib/netdev-bsd.c | 2 +- lib/netdev-dpdk.c | 2 +- lib/netdev-dummy.c | 2 +- lib/netdev-linux.c | 5 +++-- lib/netdev-provider.h | 2 +- lib/netdev-windows.c | 2 +- lib/netdev.c | 2 +- lib/netlink-conntrack.h | 2 +- lib/netlink-socket.c | 2 +- lib/netlink.c | 1 + lib/nx-match.c | 4 ++-- lib/odp-util.h | 2 +- lib/ofp-actions.c | 2 +- lib/ofp-msgs.c | 3 ++- lib/ofp-parse.c | 1 + lib/ofp-util.c | 1 + lib/ovs-lldp.h | 2 +- lib/ovs-numa.c | 2 +- lib/ovs-rcu.c | 1 + lib/ovsdb-data.c | 5 +++-- lib/ovsdb-data.h | 2 +- lib/ovsdb-error.c | 2 +- lib/ovsdb-idl-provider.h | 4 ++-- lib/ovsdb-idl.c | 4 ++-- lib/ovsdb-map-op.c | 2 +- lib/ovsdb-parser.h | 2 +- lib/ovsdb-types.c | 3 ++- lib/packets.c | 2 +- lib/pcap-file.c | 3 ++- lib/perf-counter.c | 2 +- lib/poll-loop.c | 2 +- lib/reconnect.c | 1 + lib/rstp-common.h | 2 +- lib/seq.c | 2 +- lib/shash.c | 2 +- lib/simap.h | 2 +- lib/smap.c | 2 +- lib/smap.h | 2 +- lib/sset.h | 2 +- lib/stream-ssl.c | 2 +- lib/table.c | 2 +- lib/timeval.c | 2 +- lib/tun-metadata.c | 3 ++- lib/unixctl.c | 4 ++-- lib/util.h | 1 + ofproto/bond.c | 5 +++-- ofproto/bundles.c | 2 +- ofproto/connmgr.c | 3 ++- ofproto/connmgr.h | 2 +- ofproto/ofproto-dpif-ipfix.c | 2 +- ofproto/ofproto-dpif-mirror.c | 2 +- ofproto/ofproto-dpif-monitor.c | 2 +- ofproto/ofproto-dpif-sflow.c | 2 +- ofproto/ofproto-dpif-xlate.c | 1 + ofproto/ofproto-dpif.c | 1 + ofproto/ofproto-provider.h | 2 +- ofproto/ofproto.c | 5 +++-- ofproto/pinsched.c | 2 +- ofproto/tunnel.c | 2 +- ovn/controller-vtep/binding.c | 2 +- ovn/controller-vtep/vtep.c | 4 ++-- ovn/controller/binding.c | 2 +- ovn/controller/chassis.c | 1 + ovn/controller/lport.h | 2 +- ovn/controller/ofctrl.c | 2 +- ovn/controller/ovn-controller.c | 2 +- ovn/controller/patch.c | 2 +- ovn/controller/physical.c | 3 ++- ovn/lib/actions.c | 4 ++-- ovn/lib/actions.h | 2 +- ovn/lib/expr.c | 5 +++-- ovn/lib/expr.h | 2 +- ovn/lib/lex.c | 2 +- ovn/lib/ovn-dhcp.h | 2 +- ovn/northd/ovn-northd.c | 4 ++-- ovn/utilities/ovn-nbctl.c | 2 +- ovn/utilities/ovn-sbctl.c | 4 ++-- ovsdb/column.c | 2 +- ovsdb/condition.c | 6 +++++- ovsdb/execution.c | 2 +- ovsdb/file.c | 2 +- ovsdb/jsonrpc-server.c | 3 ++- ovsdb/log.c | 2 +- ovsdb/monitor.c | 3 ++- ovsdb/mutation.c | 6 +++++- ovsdb/ovsdb-client.c | 2 +- ovsdb/ovsdb-server.c | 4 ++-- ovsdb/ovsdb-tool.c | 2 +- ovsdb/ovsdb.c | 2 +- ovsdb/ovsdb.h | 4 ++-- ovsdb/replication.c | 2 +- ovsdb/replication.h | 2 +- ovsdb/row.c | 5 +++-- ovsdb/row.h | 2 +- ovsdb/server.h | 4 ++-- ovsdb/table.c | 2 +- ovsdb/table.h | 4 ++-- ovsdb/transaction.c | 4 ++-- ovsdb/trigger.c | 2 +- python/ovs/_json.c | 2 +- tests/test-ccmap.c | 2 +- tests/test-cmap.c | 2 +- tests/test-hmap.c | 2 +- tests/test-json.c | 2 +- tests/test-jsonrpc.c | 2 +- tests/test-ovn.c | 2 +- tests/test-ovsdb.c | 2 +- utilities/ovs-vsctl.c | 2 +- vswitchd/bridge.c | 4 ++-- vswitchd/system-stats.c | 4 ++-- vtep/vtep-ctl.c | 2 +- 141 files changed, 193 insertions(+), 156 deletions(-) rename {lib => include/openvswitch}/hmap.h (99%) rename {lib => include/openvswitch}/json.h (98%) rename {lib => include/openvswitch}/shash.h (98%) diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk index d8541dc84..c0e276f9d 100644 --- a/include/openvswitch/automake.mk +++ b/include/openvswitch/automake.mk @@ -2,8 +2,10 @@ openvswitchincludedir = $(includedir)/openvswitch openvswitchinclude_HEADERS = \ include/openvswitch/compiler.h \ include/openvswitch/dynamic-string.h \ + include/openvswitch/hmap.h \ include/openvswitch/flow.h \ include/openvswitch/geneve.h \ + include/openvswitch/json.h \ include/openvswitch/list.h \ include/openvswitch/netdev.h \ include/openvswitch/match.h \ @@ -17,6 +19,7 @@ openvswitchinclude_HEADERS = \ include/openvswitch/ofp-prop.h \ include/openvswitch/ofp-util.h \ include/openvswitch/packets.h \ + include/openvswitch/shash.h \ include/openvswitch/thread.h \ include/openvswitch/token-bucket.h \ include/openvswitch/tun-metadata.h \ diff --git a/lib/hmap.h b/include/openvswitch/hmap.h similarity index 99% rename from lib/hmap.h rename to include/openvswitch/hmap.h index ea6c4e025..ef272a6e3 100644 --- a/lib/hmap.h +++ b/include/openvswitch/hmap.h @@ -19,7 +19,7 @@ #include #include -#include "util.h" +#include "openvswitch/util.h" #ifdef __cplusplus extern "C" { diff --git a/lib/json.h b/include/openvswitch/json.h similarity index 98% rename from lib/json.h rename to include/openvswitch/json.h index 3497035df..13f346cc2 100644 --- a/lib/json.h +++ b/include/openvswitch/json.h @@ -30,7 +30,8 @@ * "should" be unique). */ -#include "shash.h" +#include +#include "openvswitch/shash.h" #ifdef __cplusplus extern "C" { diff --git a/lib/shash.h b/include/openvswitch/shash.h similarity index 98% rename from lib/shash.h rename to include/openvswitch/shash.h index 5f94725d7..afc482364 100644 --- a/lib/shash.h +++ b/include/openvswitch/shash.h @@ -17,8 +17,8 @@ #ifndef SHASH_H #define SHASH_H 1 -#include "hmap.h" -#include "util.h" +#include "openvswitch/hmap.h" +#include "openvswitch/util.h" #ifdef __cplusplus extern "C" { diff --git a/lib/automake.mk b/lib/automake.mk index 1a44cc090..71c9d417b 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -94,7 +94,6 @@ lib_libopenvswitch_la_SOURCES = \ lib/hindex.c \ lib/hindex.h \ lib/hmap.c \ - lib/hmap.h \ lib/hmapx.c \ lib/hmapx.h \ lib/id-pool.c \ @@ -102,7 +101,6 @@ lib_libopenvswitch_la_SOURCES = \ lib/jhash.c \ lib/jhash.h \ lib/json.c \ - lib/json.h \ lib/jsonrpc.c \ lib/jsonrpc.h \ lib/lacp.c \ @@ -219,7 +217,6 @@ lib_libopenvswitch_la_SOURCES = \ lib/sha1.c \ lib/sha1.h \ lib/shash.c \ - lib/shash.h \ lib/simap.c \ lib/simap.h \ lib/smap.c \ diff --git a/lib/bfd.c b/lib/bfd.c index 9616c9003..8dac9538f 100644 --- a/lib/bfd.c +++ b/lib/bfd.c @@ -29,7 +29,7 @@ #include "openvswitch/dynamic-string.h" #include "flow.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/list.h" #include "netdev.h" #include "odp-util.h" diff --git a/lib/bundle.c b/lib/bundle.c index eaaf06810..7fc02e204 100644 --- a/lib/bundle.c +++ b/lib/bundle.c @@ -31,6 +31,7 @@ #include "openvswitch/ofp-util.h" #include "openvswitch/ofpbuf.h" #include "openvswitch/vlog.h" +#include "util.h" VLOG_DEFINE_THIS_MODULE(bundle); diff --git a/lib/cfm.c b/lib/cfm.c index fb077de40..7bc22e3bb 100644 --- a/lib/cfm.c +++ b/lib/cfm.c @@ -27,7 +27,7 @@ #include "openvswitch/dynamic-string.h" #include "flow.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "netdev.h" #include "ovs-atomic.h" #include "packets.h" @@ -38,6 +38,7 @@ #include "timeval.h" #include "unixctl.h" #include "openvswitch/vlog.h" +#include "util.h" VLOG_DEFINE_THIS_MODULE(cfm); diff --git a/lib/cfm.h b/lib/cfm.h index 98d48b3c5..5710c9952 100644 --- a/lib/cfm.h +++ b/lib/cfm.h @@ -18,7 +18,7 @@ #include -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/types.h" #include "packets.h" diff --git a/lib/db-ctl-base.c b/lib/db-ctl-base.c index 9f50c6c45..02eb328e2 100644 --- a/lib/db-ctl-base.c +++ b/lib/db-ctl-base.c @@ -28,12 +28,12 @@ #include "openvswitch/dynamic-string.h" #include "fatal-signal.h" #include "hash.h" -#include "json.h" +#include "openvswitch/json.h" #include "openvswitch/vlog.h" #include "ovsdb-data.h" #include "ovsdb-idl.h" #include "ovsdb-idl-provider.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "sset.h" #include "string.h" #include "table.h" diff --git a/lib/db-ctl-base.h b/lib/db-ctl-base.h index f8f576b4e..0f4658e38 100644 --- a/lib/db-ctl-base.h +++ b/lib/db-ctl-base.h @@ -19,7 +19,7 @@ #include "compiler.h" #include "openvswitch/dynamic-string.h" -#include "shash.h" +#include "openvswitch/shash.h" struct ctl_context; struct option; diff --git a/lib/dpctl.c b/lib/dpctl.c index 003602a3e..76b701c3b 100644 --- a/lib/dpctl.c +++ b/lib/dpctl.c @@ -42,7 +42,7 @@ #include "openvswitch/ofpbuf.h" #include "ovs-numa.h" #include "packets.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "simap.h" #include "smap.h" #include "sset.h" diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index e0107b721..d5d7b7e6e 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -62,7 +62,7 @@ #include "pvector.h" #include "random.h" #include "seq.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "sset.h" #include "timeval.h" #include "tnl-neigh-cache.h" diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c index e2bea2309..d5440729d 100644 --- a/lib/dpif-netlink.c +++ b/lib/dpif-netlink.c @@ -49,7 +49,7 @@ #include "packets.h" #include "poll-loop.h" #include "random.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "sset.h" #include "timeval.h" #include "unaligned.h" diff --git a/lib/dpif.c b/lib/dpif.c index 5f1be41c6..bb2c4e634 100644 --- a/lib/dpif.c +++ b/lib/dpif.c @@ -40,7 +40,7 @@ #include "poll-loop.h" #include "route-table.h" #include "seq.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "sset.h" #include "timeval.h" #include "tnl-neigh-cache.h" diff --git a/lib/fat-rwlock.c b/lib/fat-rwlock.c index 2f42b0563..19b714907 100644 --- a/lib/fat-rwlock.c +++ b/lib/fat-rwlock.c @@ -20,7 +20,7 @@ #include -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/list.h" #include "ovs-thread.h" #include "random.h" diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c index 021c8698b..7b9813dd5 100644 --- a/lib/fatal-signal.c +++ b/lib/fatal-signal.c @@ -25,7 +25,7 @@ #include #include "ovs-thread.h" #include "poll-loop.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "sset.h" #include "signals.h" #include "socket-util.h" diff --git a/lib/flow.c b/lib/flow.c index 8842e8d78..1fa3bf459 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -39,6 +39,7 @@ #include "odp-util.h" #include "random.h" #include "unaligned.h" +#include "util.h" COVERAGE_DEFINE(flow_extract); COVERAGE_DEFINE(miniflow_malloc); diff --git a/lib/hmap.c b/lib/hmap.c index 9462c5ef8..1ba4a5716 100644 --- a/lib/hmap.c +++ b/lib/hmap.c @@ -15,7 +15,7 @@ */ #include -#include "hmap.h" +#include "openvswitch/hmap.h" #include #include #include "coverage.h" diff --git a/lib/hmapx.h b/lib/hmapx.h index f977d9eed..06a6bbe67 100644 --- a/lib/hmapx.h +++ b/lib/hmapx.h @@ -17,7 +17,7 @@ #ifndef HMAPX_H #define HMAPX_H -#include "hmap.h" +#include "openvswitch/hmap.h" struct hmapx_node { struct hmap_node hmap_node; diff --git a/lib/id-pool.c b/lib/id-pool.c index f32c008c9..62a6b3311 100644 --- a/lib/id-pool.c +++ b/lib/id-pool.c @@ -17,7 +17,7 @@ #include #include "id-pool.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "hash.h" struct id_node { diff --git a/lib/json.c b/lib/json.c index 4ac250b6a..995f3c219 100644 --- a/lib/json.c +++ b/lib/json.c @@ -16,7 +16,7 @@ #include -#include "json.h" +#include "openvswitch/json.h" #include #include @@ -26,7 +26,7 @@ #include "openvswitch/dynamic-string.h" #include "hash.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "unicode.h" #include "util.h" diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c index aba742c5a..1841568b5 100644 --- a/lib/jsonrpc.c +++ b/lib/jsonrpc.c @@ -23,7 +23,7 @@ #include "byteq.h" #include "openvswitch/dynamic-string.h" #include "fatal-signal.h" -#include "json.h" +#include "openvswitch/json.h" #include "openvswitch/list.h" #include "openvswitch/ofpbuf.h" #include "ovs-thread.h" diff --git a/lib/lacp.c b/lib/lacp.c index a9d6e1e0e..ad6ef8efb 100644 --- a/lib/lacp.c +++ b/lib/lacp.c @@ -21,17 +21,18 @@ #include "connectivity.h" #include "openvswitch/dynamic-string.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "dp-packet.h" #include "ovs-atomic.h" #include "packets.h" #include "poll-loop.h" #include "seq.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "timer.h" #include "timeval.h" #include "unixctl.h" #include "openvswitch/vlog.h" +#include "util.h" VLOG_DEFINE_THIS_MODULE(lacp); diff --git a/lib/learning-switch.c b/lib/learning-switch.c index b420fe5c3..82609e80c 100644 --- a/lib/learning-switch.c +++ b/lib/learning-switch.c @@ -27,7 +27,7 @@ #include "classifier.h" #include "dp-packet.h" #include "flow.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "mac-learning.h" #include "openflow/openflow.h" #include "openvswitch/ofp-actions.h" @@ -41,7 +41,7 @@ #include "openvswitch/vlog.h" #include "poll-loop.h" #include "rconn.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "simap.h" #include "timeval.h" diff --git a/lib/lockfile.c b/lib/lockfile.c index 864d3eff0..36728ff91 100644 --- a/lib/lockfile.c +++ b/lib/lockfile.c @@ -26,7 +26,7 @@ #include "coverage.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "ovs-thread.h" #include "timeval.h" #include "util.h" diff --git a/lib/mac-learning.h b/lib/mac-learning.h index 0b62d09c0..d09e89552 100644 --- a/lib/mac-learning.h +++ b/lib/mac-learning.h @@ -19,7 +19,7 @@ #include #include "heap.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/list.h" #include "ovs-atomic.h" #include "ovs-thread.h" diff --git a/lib/mcast-snooping.h b/lib/mcast-snooping.h index 84b9c57a9..af7fb9376 100644 --- a/lib/mcast-snooping.h +++ b/lib/mcast-snooping.h @@ -21,7 +21,7 @@ #include #include "dp-packet.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/list.h" #include "ovs-atomic.h" #include "ovs-thread.h" diff --git a/lib/meta-flow.c b/lib/meta-flow.c index af579a20d..503da0cb7 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -30,7 +30,7 @@ #include "ovs-thread.h" #include "packets.h" #include "random.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "socket-util.h" #include "tun-metadata.h" #include "unaligned.h" diff --git a/lib/multipath.c b/lib/multipath.c index 30bab1423..8a1d1fadc 100644 --- a/lib/multipath.c +++ b/lib/multipath.c @@ -29,6 +29,7 @@ #include "openvswitch/ofp-errors.h" #include "openvswitch/ofp-util.h" #include "packets.h" +#include "util.h" /* Checks that 'mp' is valid on flow. Returns 0 if it is valid, otherwise an * OFPERR_*. */ diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c index 869d54d35..f963c6e52 100644 --- a/lib/netdev-bsd.c +++ b/lib/netdev-bsd.c @@ -57,7 +57,7 @@ #include "ovs-thread.h" #include "packets.h" #include "poll-loop.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "socket-util.h" #include "svec.h" #include "util.h" diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index 7fb6457af..9a9ac454e 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -48,7 +48,7 @@ #include "ovs-thread.h" #include "ovs-rcu.h" #include "packets.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "smap.h" #include "sset.h" #include "unaligned.h" diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index 2e7b7e9df..a95f7bbf8 100644 --- a/lib/netdev-dummy.c +++ b/lib/netdev-dummy.c @@ -36,7 +36,7 @@ #include "packets.h" #include "pcap-file.h" #include "poll-loop.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "sset.h" #include "stream.h" #include "unaligned.h" diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index 60ad38b9e..c71a3df58 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -55,7 +55,7 @@ #include "openvswitch/dynamic-string.h" #include "fatal-signal.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "netdev-provider.h" #include "netdev-vport.h" #include "netlink-notifier.h" @@ -67,12 +67,13 @@ #include "packets.h" #include "poll-loop.h" #include "rtnetlink.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "socket-util.h" #include "sset.h" #include "timer.h" #include "unaligned.h" #include "openvswitch/vlog.h" +#include "util.h" VLOG_DEFINE_THIS_MODULE(netdev_linux); diff --git a/lib/netdev-provider.h b/lib/netdev-provider.h index c62dbd5a1..915a5a550 100644 --- a/lib/netdev-provider.h +++ b/lib/netdev-provider.h @@ -25,7 +25,7 @@ #include "ovs-numa.h" #include "packets.h" #include "seq.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "smap.h" #ifdef __cplusplus diff --git a/lib/netdev-windows.c b/lib/netdev-windows.c index c21ffe78a..32184906d 100644 --- a/lib/netdev-windows.c +++ b/lib/netdev-windows.c @@ -27,7 +27,7 @@ #include "openvswitch/ofpbuf.h" #include "packets.h" #include "poll-loop.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "svec.h" #include "openvswitch/vlog.h" #include "odp-netlink.h" diff --git a/lib/netdev.c b/lib/netdev.c index 405bf41ef..31a6a460e 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -47,7 +47,7 @@ #include "packets.h" #include "poll-loop.h" #include "seq.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "smap.h" #include "sset.h" #include "svec.h" diff --git a/lib/netlink-conntrack.h b/lib/netlink-conntrack.h index f75259c1b..1263b2158 100644 --- a/lib/netlink-conntrack.h +++ b/lib/netlink-conntrack.h @@ -21,7 +21,7 @@ #include "compiler.h" #include "ct-dpif.h" #include "openvswitch/dynamic-string.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/ofpbuf.h" #include "timeval.h" #include "unixctl.h" diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c index 26d909b72..7502764de 100644 --- a/lib/netlink-socket.c +++ b/lib/netlink-socket.c @@ -25,7 +25,7 @@ #include "coverage.h" #include "openvswitch/dynamic-string.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "netlink.h" #include "netlink-protocol.h" #include "odp-netlink.h" diff --git a/lib/netlink.c b/lib/netlink.c index fbdb78e86..4715d68d8 100644 --- a/lib/netlink.c +++ b/lib/netlink.c @@ -27,6 +27,7 @@ #include "timeval.h" #include "unaligned.h" #include "openvswitch/vlog.h" +#include "util.h" VLOG_DEFINE_THIS_MODULE(netlink); diff --git a/lib/nx-match.c b/lib/nx-match.c index 505c6f9bc..c71ff0d64 100644 --- a/lib/nx-match.c +++ b/lib/nx-match.c @@ -22,7 +22,7 @@ #include "classifier.h" #include "colors.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openflow/nicira-ext.h" #include "openvswitch/dynamic-string.h" #include "openvswitch/meta-flow.h" @@ -32,7 +32,7 @@ #include "openvswitch/ofpbuf.h" #include "openvswitch/vlog.h" #include "packets.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "tun-metadata.h" #include "unaligned.h" #include "util.h" diff --git a/lib/odp-util.h b/lib/odp-util.h index 50e52e49b..a41bc7630 100644 --- a/lib/odp-util.h +++ b/lib/odp-util.h @@ -23,7 +23,7 @@ #include #include "flow.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "odp-netlink.h" #include "openflow/openflow.h" #include "util.h" diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index 8e41f7c72..4900addb4 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -22,7 +22,7 @@ #include "colors.h" #include "compiler.h" #include "dummy.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "learn.h" #include "multipath.h" #include "nx-match.h" diff --git a/lib/ofp-msgs.c b/lib/ofp-msgs.c index 815453928..f9660fc81 100644 --- a/lib/ofp-msgs.c +++ b/lib/ofp-msgs.c @@ -17,7 +17,7 @@ #include #include "byte-order.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openflow/nicira-ext.h" #include "openflow/openflow.h" #include "openvswitch/dynamic-string.h" @@ -25,6 +25,7 @@ #include "openvswitch/ofpbuf.h" #include "openvswitch/vlog.h" #include "ovs-thread.h" +#include "util.h" VLOG_DEFINE_THIS_MODULE(ofp_msgs); diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index 4af6d9ba2..370e3e542 100644 --- a/lib/ofp-parse.c +++ b/lib/ofp-parse.c @@ -38,6 +38,7 @@ #include "packets.h" #include "simap.h" #include "socket-util.h" +#include "util.h" /* Parses 'str' as an 8-bit unsigned integer into '*valuep'. * diff --git a/lib/ofp-util.c b/lib/ofp-util.c index 4ae83df11..6d73e694a 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -49,6 +49,7 @@ #include "random.h" #include "tun-metadata.h" #include "unaligned.h" +#include "util.h" #include "uuid.h" VLOG_DEFINE_THIS_MODULE(ofp_util); diff --git a/lib/ovs-lldp.h b/lib/ovs-lldp.h index b5c3a48c9..0e536e8c2 100644 --- a/lib/ovs-lldp.h +++ b/lib/ovs-lldp.h @@ -21,7 +21,7 @@ #include #include "dp-packet.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/list.h" #include "lldp/lldpd.h" #include "ovs-atomic.h" diff --git a/lib/ovs-numa.c b/lib/ovs-numa.c index 765263641..c8173e0b4 100644 --- a/lib/ovs-numa.c +++ b/lib/ovs-numa.c @@ -28,7 +28,7 @@ #endif /* __linux__ */ #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/list.h" #include "ovs-thread.h" #include "openvswitch/vlog.h" diff --git a/lib/ovs-rcu.c b/lib/ovs-rcu.c index 8aef1f193..0614d988c 100644 --- a/lib/ovs-rcu.c +++ b/lib/ovs-rcu.c @@ -24,6 +24,7 @@ #include "poll-loop.h" #include "seq.h" #include "timeval.h" +#include "util.h" #include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(ovs_rcu); diff --git a/lib/ovsdb-data.c b/lib/ovsdb-data.c index 22176cdb8..266a3e4cd 100644 --- a/lib/ovsdb-data.c +++ b/lib/ovsdb-data.c @@ -27,11 +27,12 @@ #include "ovs-thread.h" #include "ovsdb-error.h" #include "ovsdb-parser.h" -#include "json.h" -#include "shash.h" +#include "openvswitch/json.h" +#include "openvswitch/shash.h" #include "smap.h" #include "sort.h" #include "unicode.h" +#include "util.h" static struct json * wrap_json(const char *name, struct json *wrapped) diff --git a/lib/ovsdb-data.h b/lib/ovsdb-data.h index 278954079..98633ef5f 100644 --- a/lib/ovsdb-data.h +++ b/lib/ovsdb-data.h @@ -19,7 +19,7 @@ #include #include "compiler.h" #include "ovsdb-types.h" -#include "shash.h" +#include "openvswitch/shash.h" struct ds; struct ovsdb_symbol_table; diff --git a/lib/ovsdb-error.c b/lib/ovsdb-error.c index dbe8149ce..dfa424945 100644 --- a/lib/ovsdb-error.c +++ b/lib/ovsdb-error.c @@ -21,7 +21,7 @@ #include "backtrace.h" #include "openvswitch/dynamic-string.h" -#include "json.h" +#include "openvswitch/json.h" #include "util.h" #include "openvswitch/vlog.h" diff --git a/lib/ovsdb-idl-provider.h b/lib/ovsdb-idl-provider.h index 1f249c09a..55ed79378 100644 --- a/lib/ovsdb-idl-provider.h +++ b/lib/ovsdb-idl-provider.h @@ -16,12 +16,12 @@ #ifndef OVSDB_IDL_PROVIDER_H #define OVSDB_IDL_PROVIDER_H 1 -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/list.h" #include "ovsdb-idl.h" #include "ovsdb-map-op.h" #include "ovsdb-types.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "uuid.h" struct ovsdb_idl_row { diff --git a/lib/ovsdb-idl.c b/lib/ovsdb-idl.c index f8e980b14..15002fa5a 100644 --- a/lib/ovsdb-idl.c +++ b/lib/ovsdb-idl.c @@ -26,7 +26,7 @@ #include "coverage.h" #include "openvswitch/dynamic-string.h" #include "fatal-signal.h" -#include "json.h" +#include "openvswitch/json.h" #include "jsonrpc.h" #include "ovsdb/ovsdb.h" #include "ovsdb/table.h" @@ -35,7 +35,7 @@ #include "ovsdb-idl-provider.h" #include "ovsdb-parser.h" #include "poll-loop.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "sset.h" #include "util.h" #include "openvswitch/vlog.h" diff --git a/lib/ovsdb-map-op.c b/lib/ovsdb-map-op.c index 23fc5f526..7b90ba84f 100644 --- a/lib/ovsdb-map-op.c +++ b/lib/ovsdb-map-op.c @@ -17,7 +17,7 @@ #include #include "ovsdb-map-op.h" #include "util.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "hash.h" /* Map Operation: a Partial Map Update */ diff --git a/lib/ovsdb-parser.h b/lib/ovsdb-parser.h index 2f9f483d1..31c5a60c8 100644 --- a/lib/ovsdb-parser.h +++ b/lib/ovsdb-parser.h @@ -18,7 +18,7 @@ #include #include "compiler.h" -#include "json.h" +#include "openvswitch/json.h" #include "sset.h" #include "util.h" diff --git a/lib/ovsdb-types.c b/lib/ovsdb-types.c index 91d521602..20a84440b 100644 --- a/lib/ovsdb-types.c +++ b/lib/ovsdb-types.c @@ -21,11 +21,12 @@ #include #include "openvswitch/dynamic-string.h" -#include "json.h" +#include "openvswitch/json.h" #include "ovs-thread.h" #include "ovsdb-data.h" #include "ovsdb-error.h" #include "ovsdb-parser.h" +#include "util.h" const struct ovsdb_type ovsdb_type_integer = OVSDB_TYPE_SCALAR_INITIALIZER(OVSDB_BASE_INTEGER_INIT); diff --git a/lib/packets.c b/lib/packets.c index b5b23a64d..1bf887e22 100644 --- a/lib/packets.c +++ b/lib/packets.c @@ -26,7 +26,7 @@ #include "csum.h" #include "crc32c.h" #include "flow.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/dynamic-string.h" #include "ovs-thread.h" #include "odp-util.h" diff --git a/lib/pcap-file.c b/lib/pcap-file.c index a850d217f..dd4d22930 100644 --- a/lib/pcap-file.c +++ b/lib/pcap-file.c @@ -25,10 +25,11 @@ #include "compiler.h" #include "dp-packet.h" #include "flow.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "packets.h" #include "timeval.h" #include "unaligned.h" +#include "util.h" #include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(pcap); diff --git a/lib/perf-counter.c b/lib/perf-counter.c index c5144e7f7..da60df7e7 100644 --- a/lib/perf-counter.c +++ b/lib/perf-counter.c @@ -28,7 +28,7 @@ #include #include "openvswitch/dynamic-string.h" #include "perf-counter.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "util.h" static struct shash perf_counters = SHASH_INITIALIZER(&perf_counters); diff --git a/lib/poll-loop.c b/lib/poll-loop.c index 925198f0c..4f32189a9 100644 --- a/lib/poll-loop.c +++ b/lib/poll-loop.c @@ -30,7 +30,7 @@ #include "socket-util.h" #include "timeval.h" #include "openvswitch/vlog.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "hash.h" VLOG_DEFINE_THIS_MODULE(poll_loop); diff --git a/lib/reconnect.c b/lib/reconnect.c index bab821ebb..471fb7fc8 100644 --- a/lib/reconnect.c +++ b/lib/reconnect.c @@ -20,6 +20,7 @@ #include #include "poll-loop.h" +#include "util.h" #include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(reconnect); diff --git a/lib/rstp-common.h b/lib/rstp-common.h index 6d5acfc46..27e8079b9 100644 --- a/lib/rstp-common.h +++ b/lib/rstp-common.h @@ -33,7 +33,7 @@ #include "rstp.h" #include #include -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/list.h" #include "ovs-atomic.h" #include "packets.h" diff --git a/lib/seq.c b/lib/seq.c index b8b5b6529..6e2f596ea 100644 --- a/lib/seq.c +++ b/lib/seq.c @@ -22,7 +22,7 @@ #include "coverage.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "latch.h" #include "openvswitch/list.h" #include "ovs-thread.h" diff --git a/lib/shash.c b/lib/shash.c index 4285c0745..3e94b172a 100644 --- a/lib/shash.c +++ b/lib/shash.c @@ -15,7 +15,7 @@ */ #include -#include "shash.h" +#include "openvswitch/shash.h" #include "hash.h" static struct shash_node *shash_find__(const struct shash *, diff --git a/lib/simap.h b/lib/simap.h index 113db9384..9486080f4 100644 --- a/lib/simap.h +++ b/lib/simap.h @@ -17,7 +17,7 @@ #ifndef SIMAP_H #define SIMAP_H 1 -#include "hmap.h" +#include "openvswitch/hmap.h" #ifdef __cplusplus extern "C" { diff --git a/lib/smap.c b/lib/smap.c index 07dd23aee..aff7eb0b2 100644 --- a/lib/smap.c +++ b/lib/smap.c @@ -18,7 +18,7 @@ #include #include "hash.h" -#include "json.h" +#include "openvswitch/json.h" #include "packets.h" #include "uuid.h" diff --git a/lib/smap.h b/lib/smap.h index 038b7697a..29f99e69a 100644 --- a/lib/smap.h +++ b/lib/smap.h @@ -17,7 +17,7 @@ #include #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" struct json; struct uuid; diff --git a/lib/sset.h b/lib/sset.h index c3b5e971d..768d0cf0a 100644 --- a/lib/sset.h +++ b/lib/sset.h @@ -17,7 +17,7 @@ #ifndef SSET_H #define SSET_H -#include "hmap.h" +#include "openvswitch/hmap.h" #include "util.h" #ifdef __cplusplus diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c index bf80fc8a4..a5c32a12a 100644 --- a/lib/stream-ssl.c +++ b/lib/stream-ssl.c @@ -39,7 +39,7 @@ #include "openflow/openflow.h" #include "packets.h" #include "poll-loop.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "socket-util.h" #include "util.h" #include "stream-provider.h" diff --git a/lib/table.c b/lib/table.c index a2cfe3d1b..9158499bf 100644 --- a/lib/table.c +++ b/lib/table.c @@ -19,7 +19,7 @@ #include "table.h" #include "openvswitch/dynamic-string.h" -#include "json.h" +#include "openvswitch/json.h" #include "ovsdb-data.h" #include "ovsdb-error.h" #include "timeval.h" diff --git a/lib/timeval.c b/lib/timeval.c index 8e5f971c2..0e8709af1 100644 --- a/lib/timeval.c +++ b/lib/timeval.c @@ -30,7 +30,7 @@ #include "openvswitch/dynamic-string.h" #include "fatal-signal.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "ovs-rcu.h" #include "ovs-thread.h" #include "signals.h" diff --git a/lib/tun-metadata.c b/lib/tun-metadata.c index 7a2a84fca..36006e3ba 100644 --- a/lib/tun-metadata.c +++ b/lib/tun-metadata.c @@ -20,7 +20,7 @@ #include "bitmap.h" #include "compiler.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/match.h" #include "nx-match.h" #include "odp-netlink.h" @@ -29,6 +29,7 @@ #include "ovs-rcu.h" #include "packets.h" #include "tun-metadata.h" +#include "util.h" struct tun_meta_entry { struct hmap_node node; /* In struct tun_table's key_hmap. */ diff --git a/lib/unixctl.c b/lib/unixctl.c index 935c1450c..5e5d26c68 100644 --- a/lib/unixctl.c +++ b/lib/unixctl.c @@ -21,11 +21,11 @@ #include "coverage.h" #include "dirs.h" #include "openvswitch/dynamic-string.h" -#include "json.h" +#include "openvswitch/json.h" #include "jsonrpc.h" #include "openvswitch/list.h" #include "poll-loop.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "stream.h" #include "stream-provider.h" #include "svec.h" diff --git a/lib/util.h b/lib/util.h index e738c9fc9..5049d159e 100644 --- a/lib/util.h +++ b/lib/util.h @@ -25,6 +25,7 @@ #include #include #include "compiler.h" +#include "util.h" #include "openvswitch/util.h" extern char *program_name; diff --git a/ofproto/bond.c b/ofproto/bond.c index 032b8f61d..1d0c3ce3f 100644 --- a/ofproto/bond.c +++ b/ofproto/bond.c @@ -27,7 +27,7 @@ #include "coverage.h" #include "dp-packet.h" #include "flow.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "lacp.h" #include "netdev.h" #include "odp-util.h" @@ -44,9 +44,10 @@ #include "packets.h" #include "poll-loop.h" #include "seq.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "timeval.h" #include "unixctl.h" +#include "util.h" VLOG_DEFINE_THIS_MODULE(bond); diff --git a/ofproto/bundles.c b/ofproto/bundles.c index 232cc15e0..aa8e58cab 100644 --- a/ofproto/bundles.c +++ b/ofproto/bundles.c @@ -34,7 +34,7 @@ #include "poll-loop.h" #include "pktbuf.h" #include "rconn.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "simap.h" #include "stream.h" #include "timeval.h" diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c index 0c48b7785..d70d9902c 100644 --- a/ofproto/connmgr.c +++ b/ofproto/connmgr.c @@ -36,10 +36,11 @@ #include "poll-loop.h" #include "pktbuf.h" #include "rconn.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "simap.h" #include "stream.h" #include "timeval.h" +#include "util.h" VLOG_DEFINE_THIS_MODULE(connmgr); static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h index 30e7ae52c..be4ce2894 100644 --- a/ofproto/connmgr.h +++ b/ofproto/connmgr.h @@ -18,7 +18,7 @@ #define CONNMGR_H 1 #include "classifier.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/list.h" #include "openvswitch/match.h" #include "openvswitch/ofp-util.h" diff --git a/ofproto/ofproto-dpif-ipfix.c b/ofproto/ofproto-dpif-ipfix.c index 5744abbcb..0128c91a6 100644 --- a/ofproto/ofproto-dpif-ipfix.c +++ b/ofproto/ofproto-dpif-ipfix.c @@ -21,7 +21,7 @@ #include "collectors.h" #include "flow.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "netdev.h" #include "openvswitch/list.h" #include "openvswitch/ofpbuf.h" diff --git a/ofproto/ofproto-dpif-mirror.c b/ofproto/ofproto-dpif-mirror.c index 84b784589..675adf300 100644 --- a/ofproto/ofproto-dpif-mirror.c +++ b/ofproto/ofproto-dpif-mirror.c @@ -18,7 +18,7 @@ #include -#include "hmap.h" +#include "openvswitch/hmap.h" #include "hmapx.h" #include "ofproto.h" #include "vlan-bitmap.h" diff --git a/ofproto/ofproto-dpif-monitor.c b/ofproto/ofproto-dpif-monitor.c index 11d7a54ba..623d51706 100644 --- a/ofproto/ofproto-dpif-monitor.c +++ b/ofproto/ofproto-dpif-monitor.c @@ -25,7 +25,7 @@ #include "guarded-list.h" #include "hash.h" #include "heap.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "latch.h" #include "openvswitch/ofpbuf.h" #include "ofproto-dpif.h" diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c index 7d0aa36f0..8a19d1584 100644 --- a/ofproto/ofproto-dpif-sflow.c +++ b/ofproto/ofproto-dpif-sflow.c @@ -26,7 +26,7 @@ #include "compiler.h" #include "dpif.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "netdev.h" #include "netlink.h" #include "openvswitch/ofpbuf.h" diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index 3ff7a6b66..160da5b9d 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -59,6 +59,7 @@ #include "tnl-neigh-cache.h" #include "tnl-ports.h" #include "tunnel.h" +#include "util.h" COVERAGE_DEFINE(xlate_actions); COVERAGE_DEFINE(xlate_actions_oversize); diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index ce9383ad4..faff1c757 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -68,6 +68,7 @@ #include "tunnel.h" #include "unaligned.h" #include "unixctl.h" +#include "util.h" #include "vlan-bitmap.h" VLOG_DEFINE_THIS_MODULE(ofproto_dpif); diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h index ae6c08dde..25f8dc0f4 100644 --- a/ofproto/ofproto-provider.h +++ b/ofproto/ofproto-provider.h @@ -46,7 +46,7 @@ #include "ovs-atomic.h" #include "ovs-rcu.h" #include "ovs-thread.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "simap.h" #include "timeval.h" diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 5f84aa181..dcb0a0847 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -31,7 +31,7 @@ #include "coverage.h" #include "dp-packet.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "netdev.h" #include "nx-match.h" #include "ofproto.h" @@ -54,7 +54,7 @@ #include "poll-loop.h" #include "random.h" #include "seq.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "simap.h" #include "smap.h" #include "sset.h" @@ -62,6 +62,7 @@ #include "tun-metadata.h" #include "unaligned.h" #include "unixctl.h" +#include "util.h" VLOG_DEFINE_THIS_MODULE(ofproto); diff --git a/ofproto/pinsched.c b/ofproto/pinsched.c index ee252f4f9..51f176050 100644 --- a/ofproto/pinsched.c +++ b/ofproto/pinsched.c @@ -23,7 +23,7 @@ #include #include "flow.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/ofpbuf.h" #include "openflow/openflow.h" #include "poll-loop.h" diff --git a/ofproto/tunnel.c b/ofproto/tunnel.c index 85a485cd2..9a69071c0 100644 --- a/ofproto/tunnel.c +++ b/ofproto/tunnel.c @@ -24,7 +24,7 @@ #include "openvswitch/dynamic-string.h" #include "fat-rwlock.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "netdev.h" #include "odp-util.h" #include "openvswitch/ofpbuf.h" diff --git a/ovn/controller-vtep/binding.c b/ovn/controller-vtep/binding.c index 65070d6a8..9cbfadc71 100644 --- a/ovn/controller-vtep/binding.c +++ b/ovn/controller-vtep/binding.c @@ -16,7 +16,7 @@ #include #include "binding.h" -#include "lib/shash.h" +#include "openvswitch/shash.h" #include "lib/smap.h" #include "lib/util.h" #include "openvswitch/vlog.h" diff --git a/ovn/controller-vtep/vtep.c b/ovn/controller-vtep/vtep.c index 9e11e2804..976e9336d 100644 --- a/ovn/controller-vtep/vtep.c +++ b/ovn/controller-vtep/vtep.c @@ -18,8 +18,8 @@ #include "vtep.h" #include "lib/hash.h" -#include "lib/hmap.h" -#include "lib/shash.h" +#include "openvswitch/hmap.h" +#include "openvswitch/shash.h" #include "lib/smap.h" #include "lib/sset.h" #include "lib/util.h" diff --git a/ovn/controller/binding.c b/ovn/controller/binding.c index 0dea828ba..e83c1d52b 100644 --- a/ovn/controller/binding.c +++ b/ovn/controller/binding.c @@ -19,11 +19,11 @@ #include "lport.h" #include "lib/bitmap.h" -#include "lib/hmap.h" #include "lib/poll-loop.h" #include "lib/sset.h" #include "lib/util.h" #include "lib/vswitch-idl.h" +#include "openvswitch/hmap.h" #include "openvswitch/vlog.h" #include "ovn/lib/ovn-sb-idl.h" #include "ovn-controller.h" diff --git a/ovn/controller/chassis.c b/ovn/controller/chassis.c index d40181b72..502e74d50 100644 --- a/ovn/controller/chassis.c +++ b/ovn/controller/chassis.c @@ -24,6 +24,7 @@ #include "openvswitch/vlog.h" #include "ovn/lib/ovn-sb-idl.h" #include "ovn-controller.h" +#include "lib/util.h" VLOG_DEFINE_THIS_MODULE(chassis); diff --git a/ovn/controller/lport.h b/ovn/controller/lport.h index bb8d8cd57..9e9c6d3a1 100644 --- a/ovn/controller/lport.h +++ b/ovn/controller/lport.h @@ -17,7 +17,7 @@ #define OVN_LPORT_H 1 #include -#include "hmap.h" +#include "openvswitch/hmap.h" #include "uuid.h" struct ovsdb_idl; diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c index 5b55597d2..184e86fba 100644 --- a/ovn/controller/ofctrl.c +++ b/ovn/controller/ofctrl.c @@ -20,10 +20,10 @@ #include "flow.h" #include "hash.h" #include "hindex.h" -#include "hmap.h" #include "ofctrl.h" #include "openflow/openflow.h" #include "openvswitch/dynamic-string.h" +#include "openvswitch/hmap.h" #include "openvswitch/list.h" #include "openvswitch/match.h" #include "openvswitch/ofp-actions.h" diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c index 72b1c482d..dcab918ad 100644 --- a/ovn/controller/ovn-controller.c +++ b/ovn/controller/ovn-controller.c @@ -32,7 +32,7 @@ #include "openvswitch/dynamic-string.h" #include "encaps.h" #include "fatal-signal.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "lflow.h" #include "lib/vswitch-idl.h" #include "lport.h" diff --git a/ovn/controller/patch.c b/ovn/controller/patch.c index fa38f78a2..707d08b01 100644 --- a/ovn/controller/patch.c +++ b/ovn/controller/patch.c @@ -19,9 +19,9 @@ #include "hash.h" #include "lflow.h" -#include "lib/hmap.h" #include "lib/vswitch-idl.h" #include "lport.h" +#include "openvswitch/hmap.h" #include "openvswitch/vlog.h" #include "ovn-controller.h" diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c index 11b2c2b7d..a104e3347 100644 --- a/ovn/controller/physical.c +++ b/ovn/controller/physical.c @@ -28,10 +28,11 @@ #include "ovn/lib/ovn-sb-idl.h" #include "ovn/lib/ovn-util.h" #include "physical.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "simap.h" #include "smap.h" #include "sset.h" +#include "util.h" #include "vswitch-idl.h" VLOG_DEFINE_THIS_MODULE(physical); diff --git a/ovn/lib/actions.c b/ovn/lib/actions.c index dda895935..6e2bf9335 100644 --- a/ovn/lib/actions.c +++ b/ovn/lib/actions.c @@ -24,7 +24,7 @@ #include "ovn-dhcp.h" #include "expr.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "lex.h" #include "logical-fields.h" #include "nx-match.h" @@ -32,7 +32,7 @@ #include "openvswitch/ofp-actions.h" #include "openvswitch/ofpbuf.h" #include "packets.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "simap.h" /* Context maintained during actions_parse(). */ diff --git a/ovn/lib/actions.h b/ovn/lib/actions.h index 48f014089..114c71e67 100644 --- a/ovn/lib/actions.h +++ b/ovn/lib/actions.h @@ -20,7 +20,7 @@ #include #include #include "compiler.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/dynamic-string.h" #include "util.h" diff --git a/ovn/lib/expr.c b/ovn/lib/expr.c index 8c0768d2c..1c38b9930 100644 --- a/ovn/lib/expr.c +++ b/ovn/lib/expr.c @@ -17,16 +17,17 @@ #include #include "byte-order.h" #include "expr.h" -#include "json.h" +#include "openvswitch/json.h" #include "lex.h" #include "logical-fields.h" #include "openvswitch/dynamic-string.h" #include "openvswitch/match.h" #include "openvswitch/ofp-actions.h" #include "openvswitch/vlog.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "simap.h" #include "sset.h" +#include "util.h" VLOG_DEFINE_THIS_MODULE(expr); diff --git a/ovn/lib/expr.h b/ovn/lib/expr.h index ed5300f1d..d790c4959 100644 --- a/ovn/lib/expr.h +++ b/ovn/lib/expr.h @@ -54,7 +54,7 @@ #include "classifier.h" #include "lex.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/list.h" #include "openvswitch/match.h" #include "openvswitch/meta-flow.h" diff --git a/ovn/lib/lex.c b/ovn/lib/lex.c index 52c0946f9..79aa22115 100644 --- a/ovn/lib/lex.c +++ b/ovn/lib/lex.c @@ -20,7 +20,7 @@ #include #include #include "openvswitch/dynamic-string.h" -#include "json.h" +#include "openvswitch/json.h" #include "packets.h" #include "util.h" diff --git a/ovn/lib/ovn-dhcp.h b/ovn/lib/ovn-dhcp.h index 4da614bfc..6750f9513 100644 --- a/ovn/lib/ovn-dhcp.h +++ b/ovn/lib/ovn-dhcp.h @@ -17,7 +17,7 @@ #ifndef OVN_DHCP_H #define OVN_DHCP_H 1 -#include "hmap.h" +#include "openvswitch/hmap.h" #include "hash.h" struct dhcp_opts_map { diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c index e030a4f2f..a3d167200 100644 --- a/ovn/northd/ovn-northd.c +++ b/ovn/northd/ovn-northd.c @@ -24,8 +24,8 @@ #include "openvswitch/dynamic-string.h" #include "fatal-signal.h" #include "hash.h" -#include "hmap.h" -#include "json.h" +#include "openvswitch/hmap.h" +#include "openvswitch/json.h" #include "ovn/lib/lex.h" #include "ovn/lib/ovn-nb-idl.h" #include "ovn/lib/ovn-sb-idl.h" diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c index 25916dabd..d523eec83 100644 --- a/ovn/utilities/ovn-nbctl.c +++ b/ovn/utilities/ovn-nbctl.c @@ -23,7 +23,7 @@ #include "db-ctl-base.h" #include "dirs.h" #include "fatal-signal.h" -#include "json.h" +#include "openvswitch/json.h" #include "ovn/lib/ovn-nb-idl.h" #include "packets.h" #include "poll-loop.h" diff --git a/ovn/utilities/ovn-sbctl.c b/ovn/utilities/ovn-sbctl.c index 21ae98dd0..85dab067c 100644 --- a/ovn/utilities/ovn-sbctl.c +++ b/ovn/utilities/ovn-sbctl.c @@ -34,13 +34,13 @@ #include "compiler.h" #include "openvswitch/dynamic-string.h" #include "fatal-signal.h" -#include "json.h" +#include "openvswitch/json.h" #include "ovsdb-data.h" #include "ovsdb-idl.h" #include "poll-loop.h" #include "process.h" #include "sset.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "stream-ssl.h" #include "stream.h" #include "table.h" diff --git a/ovsdb/column.c b/ovsdb/column.c index b41df2e4c..8838df3eb 100644 --- a/ovsdb/column.c +++ b/ovsdb/column.c @@ -21,7 +21,7 @@ #include "column.h" #include "openvswitch/dynamic-string.h" -#include "json.h" +#include "openvswitch/json.h" #include "ovsdb-error.h" #include "ovsdb-parser.h" #include "table.h" diff --git a/ovsdb/condition.c b/ovsdb/condition.c index 39a097752..6da3b08ad 100644 --- a/ovsdb/condition.c +++ b/ovsdb/condition.c @@ -20,10 +20,14 @@ #include #include "column.h" -#include "json.h" +#include "openvswitch/json.h" #include "ovsdb-error.h" #include "row.h" + +#include + #include "table.h" +#include "util.h" struct ovsdb_error * ovsdb_function_from_string(const char *name, enum ovsdb_function *function) diff --git a/ovsdb/execution.c b/ovsdb/execution.c index d3fc8b914..e972ce7ad 100644 --- a/ovsdb/execution.c +++ b/ovsdb/execution.c @@ -20,7 +20,7 @@ #include "column.h" #include "condition.h" #include "file.h" -#include "json.h" +#include "openvswitch/json.h" #include "mutation.h" #include "ovsdb-data.h" #include "ovsdb-error.h" diff --git a/ovsdb/file.c b/ovsdb/file.c index 2894f30da..7f8554ada 100644 --- a/ovsdb/file.c +++ b/ovsdb/file.c @@ -24,7 +24,7 @@ #include "bitmap.h" #include "column.h" #include "log.h" -#include "json.h" +#include "openvswitch/json.h" #include "lockfile.h" #include "ovsdb.h" #include "ovsdb-error.h" diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c index 864fb0309..bde912227 100644 --- a/ovsdb/jsonrpc-server.c +++ b/ovsdb/jsonrpc-server.c @@ -23,7 +23,7 @@ #include "column.h" #include "openvswitch/dynamic-string.h" #include "monitor.h" -#include "json.h" +#include "openvswitch/json.h" #include "jsonrpc.h" #include "ovsdb-error.h" #include "ovsdb-parser.h" @@ -39,6 +39,7 @@ #include "timeval.h" #include "transaction.h" #include "trigger.h" +#include "util.h" #include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(ovsdb_jsonrpc_server); diff --git a/ovsdb/log.c b/ovsdb/log.c index 8004d3dce..380f5e93d 100644 --- a/ovsdb/log.c +++ b/ovsdb/log.c @@ -24,7 +24,7 @@ #include #include -#include "json.h" +#include "openvswitch/json.h" #include "lockfile.h" #include "ovsdb.h" #include "ovsdb-error.h" diff --git a/ovsdb/monitor.c b/ovsdb/monitor.c index 54c27c448..99083e1a2 100644 --- a/ovsdb/monitor.c +++ b/ovsdb/monitor.c @@ -21,7 +21,7 @@ #include "bitmap.h" #include "column.h" #include "openvswitch/dynamic-string.h" -#include "json.h" +#include "openvswitch/json.h" #include "jsonrpc.h" #include "ovsdb-error.h" #include "ovsdb-parser.h" @@ -36,6 +36,7 @@ #include "transaction.h" #include "jsonrpc-server.h" #include "monitor.h" +#include "util.h" #include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(ovsdb_monitor); diff --git a/ovsdb/mutation.c b/ovsdb/mutation.c index 6a43e3423..e5d192e15 100644 --- a/ovsdb/mutation.c +++ b/ovsdb/mutation.c @@ -22,9 +22,13 @@ #include "column.h" #include "ovsdb-error.h" -#include "json.h" +#include "openvswitch/json.h" #include "row.h" + +#include + #include "table.h" +#include "util.h" struct ovsdb_error * ovsdb_mutator_from_string(const char *name, enum ovsdb_mutator *mutator) diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c index 4105d4741..7dcc07c94 100644 --- a/ovsdb/ovsdb-client.c +++ b/ovsdb/ovsdb-client.c @@ -32,7 +32,7 @@ #include "dirs.h" #include "openvswitch/dynamic-string.h" #include "fatal-signal.h" -#include "json.h" +#include "openvswitch/json.h" #include "jsonrpc.h" #include "lib/table.h" #include "ovsdb.h" diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index 11801188d..239cca8ec 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -30,7 +30,7 @@ #include "fatal-signal.h" #include "file.h" #include "hash.h" -#include "json.h" +#include "openvswitch/json.h" #include "jsonrpc.h" #include "jsonrpc-server.h" #include "openvswitch/list.h" @@ -45,7 +45,7 @@ #include "replication.h" #include "row.h" #include "simap.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "stream-ssl.h" #include "stream.h" #include "sset.h" diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c index 37e219ff4..af83da201 100644 --- a/ovsdb/ovsdb-tool.c +++ b/ovsdb/ovsdb-tool.c @@ -31,7 +31,7 @@ #include "file.h" #include "lockfile.h" #include "log.h" -#include "json.h" +#include "openvswitch/json.h" #include "ovsdb.h" #include "ovsdb-data.h" #include "ovsdb-error.h" diff --git a/ovsdb/ovsdb.c b/ovsdb/ovsdb.c index b7cc655da..03919004d 100644 --- a/ovsdb/ovsdb.c +++ b/ovsdb/ovsdb.c @@ -18,7 +18,7 @@ #include "ovsdb.h" #include "column.h" -#include "json.h" +#include "openvswitch/json.h" #include "ovsdb-error.h" #include "ovsdb-parser.h" #include "ovsdb-types.h" diff --git a/ovsdb/ovsdb.h b/ovsdb/ovsdb.h index b3eaf15f0..418805c15 100644 --- a/ovsdb/ovsdb.h +++ b/ovsdb/ovsdb.h @@ -17,9 +17,9 @@ #define OVSDB_OVSDB_H 1 #include "compiler.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/list.h" -#include "shash.h" +#include "openvswitch/shash.h" struct json; struct ovsdb_log; diff --git a/ovsdb/replication.c b/ovsdb/replication.c index 736771461..52b708523 100644 --- a/ovsdb/replication.c +++ b/ovsdb/replication.c @@ -20,7 +20,7 @@ #include "replication.h" #include "condition.h" -#include "json.h" +#include "openvswitch/json.h" #include "jsonrpc.h" #include "ovsdb.h" #include "ovsdb-error.h" diff --git a/ovsdb/replication.h b/ovsdb/replication.h index 012ca0960..93ac22b22 100644 --- a/ovsdb/replication.h +++ b/ovsdb/replication.h @@ -18,7 +18,7 @@ #ifndef REPLICATION_H #define REPLICATION_H 1 -#include "shash.h" +#include "openvswitch/shash.h" struct db { /* Initialized in main(). */ diff --git a/ovsdb/row.c b/ovsdb/row.c index 572c10321..9c312947e 100644 --- a/ovsdb/row.c +++ b/ovsdb/row.c @@ -20,11 +20,12 @@ #include #include "openvswitch/dynamic-string.h" -#include "json.h" +#include "openvswitch/json.h" #include "ovsdb-error.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "sort.h" #include "table.h" +#include "util.h" static struct ovsdb_row * allocate_row(const struct ovsdb_table *table) diff --git a/ovsdb/row.h b/ovsdb/row.h index b1d1edd47..83024bc0f 100644 --- a/ovsdb/row.h +++ b/ovsdb/row.h @@ -19,7 +19,7 @@ #include #include #include "column.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/list.h" #include "ovsdb-data.h" diff --git a/ovsdb/server.h b/ovsdb/server.h index 667fce992..c0bbb69ce 100644 --- a/ovsdb/server.h +++ b/ovsdb/server.h @@ -16,9 +16,9 @@ #ifndef SERVER_H #define SERVER_H 1 -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openvswitch/list.h" -#include "shash.h" +#include "openvswitch/shash.h" struct ovsdb; struct ovsdb_server; diff --git a/ovsdb/table.c b/ovsdb/table.c index e7545ad31..7ec55d61f 100644 --- a/ovsdb/table.c +++ b/ovsdb/table.c @@ -19,7 +19,7 @@ #include -#include "json.h" +#include "openvswitch/json.h" #include "column.h" #include "ovsdb-error.h" #include "ovsdb-parser.h" diff --git a/ovsdb/table.h b/ovsdb/table.h index 68a59add4..f910d1880 100644 --- a/ovsdb/table.h +++ b/ovsdb/table.h @@ -18,8 +18,8 @@ #include #include "compiler.h" -#include "hmap.h" -#include "shash.h" +#include "openvswitch/hmap.h" +#include "openvswitch/shash.h" struct json; struct uuid; diff --git a/ovsdb/transaction.c b/ovsdb/transaction.c index 9e12a6225..865e9b6b2 100644 --- a/ovsdb/transaction.c +++ b/ovsdb/transaction.c @@ -20,8 +20,8 @@ #include "bitmap.h" #include "openvswitch/dynamic-string.h" #include "hash.h" -#include "hmap.h" -#include "json.h" +#include "openvswitch/hmap.h" +#include "openvswitch/json.h" #include "openvswitch/list.h" #include "ovsdb-error.h" #include "ovsdb.h" diff --git a/ovsdb/trigger.c b/ovsdb/trigger.c index 3392fb72f..0fbe94908 100644 --- a/ovsdb/trigger.c +++ b/ovsdb/trigger.c @@ -19,7 +19,7 @@ #include -#include "json.h" +#include "openvswitch/json.h" #include "jsonrpc.h" #include "ovsdb.h" #include "poll-loop.h" diff --git a/python/ovs/_json.c b/python/ovs/_json.c index c4e2af33f..7067ce26a 100644 --- a/python/ovs/_json.c +++ b/python/ovs/_json.c @@ -1,5 +1,5 @@ #include "Python.h" -#include +#include #include "structmember.h" #if PY_MAJOR_VERSION >= 3 diff --git a/tests/test-ccmap.c b/tests/test-ccmap.c index 2f2cdd672..4efe1b975 100644 --- a/tests/test-ccmap.c +++ b/tests/test-ccmap.c @@ -27,7 +27,7 @@ #include "command-line.h" #include "fat-rwlock.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "ovstest.h" #include "ovs-thread.h" #include "random.h" diff --git a/tests/test-cmap.c b/tests/test-cmap.c index 05aba00fe..4cac7de9e 100644 --- a/tests/test-cmap.c +++ b/tests/test-cmap.c @@ -27,7 +27,7 @@ #include "command-line.h" #include "fat-rwlock.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "ovstest.h" #include "ovs-thread.h" #include "random.h" diff --git a/tests/test-hmap.c b/tests/test-hmap.c index c63bd8022..9259b0b3f 100644 --- a/tests/test-hmap.c +++ b/tests/test-hmap.c @@ -19,7 +19,7 @@ #include #undef NDEBUG -#include "hmap.h" +#include "openvswitch/hmap.h" #include #include #include "hash.h" diff --git a/tests/test-json.c b/tests/test-json.c index 692013ecc..281921057 100644 --- a/tests/test-json.c +++ b/tests/test-json.c @@ -16,7 +16,7 @@ #include #undef NDEBUG -#include "json.h" +#include "openvswitch/json.h" #include #include #include diff --git a/tests/test-jsonrpc.c b/tests/test-jsonrpc.c index feac0b0af..be79064ad 100644 --- a/tests/test-jsonrpc.c +++ b/tests/test-jsonrpc.c @@ -24,7 +24,7 @@ #include #include "command-line.h" #include "daemon.h" -#include "json.h" +#include "openvswitch/json.h" #include "ovstest.h" #include "poll-loop.h" #include "stream-ssl.h" diff --git a/tests/test-ovn.c b/tests/test-ovn.c index fd004c9e0..26055bb03 100644 --- a/tests/test-ovn.c +++ b/tests/test-ovn.c @@ -32,7 +32,7 @@ #include "ovn/lib/ovn-dhcp.h" #include "ovs-thread.h" #include "ovstest.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "simap.h" #include "util.h" diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c index 6357c9cd4..c21001e3a 100644 --- a/tests/test-ovsdb.c +++ b/tests/test-ovsdb.c @@ -26,7 +26,7 @@ #include "byte-order.h" #include "command-line.h" #include "openvswitch/dynamic-string.h" -#include "json.h" +#include "openvswitch/json.h" #include "jsonrpc.h" #include "ovsdb-data.h" #include "ovsdb-error.h" diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index c98dd3f3d..722dcd9fb 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -34,7 +34,7 @@ #include "openvswitch/dynamic-string.h" #include "fatal-signal.h" #include "hash.h" -#include "json.h" +#include "openvswitch/json.h" #include "ovsdb-data.h" #include "ovsdb-idl.h" #include "poll-loop.h" diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index a5de84e44..03c50048f 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -29,7 +29,7 @@ #include "dirs.h" #include "dpif.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "hmapx.h" #include "if-notifier.h" #include "jsonrpc.h" @@ -55,7 +55,7 @@ #include "seq.h" #include "sflow_api.h" #include "sha1.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "smap.h" #include "socket-util.h" #include "stream.h" diff --git a/vswitchd/system-stats.c b/vswitchd/system-stats.c index 129f0cf82..49e541981 100644 --- a/vswitchd/system-stats.c +++ b/vswitchd/system-stats.c @@ -34,13 +34,13 @@ #include "daemon.h" #include "dirs.h" #include "openvswitch/dynamic-string.h" -#include "json.h" +#include "openvswitch/json.h" #include "latch.h" #include "openvswitch/ofpbuf.h" #include "ovs-rcu.h" #include "ovs-thread.h" #include "poll-loop.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "smap.h" #include "timeval.h" #include "openvswitch/vlog.h" diff --git a/vtep/vtep-ctl.c b/vtep/vtep-ctl.c index 759150f1d..245ba0db1 100644 --- a/vtep/vtep-ctl.c +++ b/vtep/vtep-ctl.c @@ -34,7 +34,7 @@ #include "openvswitch/dynamic-string.h" #include "fatal-signal.h" #include "hash.h" -#include "json.h" +#include "openvswitch/json.h" #include "ovsdb-data.h" #include "ovsdb-idl.h" #include "poll-loop.h" -- 2.20.1