[ovs-git] [openvswitch/ovs] ee89ea: json: Move from lib to include/openvswitch.

GitHub noreply at github.com
Sat Jul 23 00:09:38 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: ee89ea7b477bb4fd05137de03b2e8443807ed9f4
      https://github.com/openvswitch/ovs/commit/ee89ea7b477bb4fd05137de03b2e8443807ed9f4
  Author: Terry Wilson <twilson at redhat.com>
  Date:   2016-07-22 (Fri, 22 Jul 2016)

  Changed paths:
    M include/openvswitch/automake.mk
    A include/openvswitch/hmap.h
    A include/openvswitch/json.h
    A include/openvswitch/shash.h
    M lib/automake.mk
    M lib/bfd.c
    M lib/bundle.c
    M lib/cfm.c
    M lib/cfm.h
    M lib/db-ctl-base.c
    M lib/db-ctl-base.h
    M lib/dpctl.c
    M lib/dpif-netdev.c
    M lib/dpif-netlink.c
    M lib/dpif.c
    M lib/fat-rwlock.c
    M lib/fatal-signal.c
    M lib/flow.c
    M lib/hmap.c
    R lib/hmap.h
    M lib/hmapx.h
    M lib/id-pool.c
    M lib/json.c
    R lib/json.h
    M lib/jsonrpc.c
    M lib/lacp.c
    M lib/learning-switch.c
    M lib/lockfile.c
    M lib/mac-learning.h
    M lib/mcast-snooping.h
    M lib/meta-flow.c
    M lib/multipath.c
    M lib/netdev-bsd.c
    M lib/netdev-dpdk.c
    M lib/netdev-dummy.c
    M lib/netdev-linux.c
    M lib/netdev-provider.h
    M lib/netdev-windows.c
    M lib/netdev.c
    M lib/netlink-conntrack.h
    M lib/netlink-socket.c
    M lib/netlink.c
    M lib/nx-match.c
    M lib/odp-util.h
    M lib/ofp-actions.c
    M lib/ofp-msgs.c
    M lib/ofp-parse.c
    M lib/ofp-util.c
    M lib/ovs-lldp.h
    M lib/ovs-numa.c
    M lib/ovs-rcu.c
    M lib/ovsdb-data.c
    M lib/ovsdb-data.h
    M lib/ovsdb-error.c
    M lib/ovsdb-idl-provider.h
    M lib/ovsdb-idl.c
    M lib/ovsdb-map-op.c
    M lib/ovsdb-parser.h
    M lib/ovsdb-types.c
    M lib/packets.c
    M lib/pcap-file.c
    M lib/perf-counter.c
    M lib/poll-loop.c
    M lib/reconnect.c
    M lib/rstp-common.h
    M lib/seq.c
    M lib/shash.c
    R lib/shash.h
    M lib/simap.h
    M lib/smap.c
    M lib/smap.h
    M lib/sset.h
    M lib/stream-ssl.c
    M lib/table.c
    M lib/timeval.c
    M lib/tun-metadata.c
    M lib/unixctl.c
    M lib/util.h
    M ofproto/bond.c
    M ofproto/bundles.c
    M ofproto/connmgr.c
    M ofproto/connmgr.h
    M ofproto/ofproto-dpif-ipfix.c
    M ofproto/ofproto-dpif-mirror.c
    M ofproto/ofproto-dpif-monitor.c
    M ofproto/ofproto-dpif-sflow.c
    M ofproto/ofproto-dpif-xlate.c
    M ofproto/ofproto-dpif.c
    M ofproto/ofproto-provider.h
    M ofproto/ofproto.c
    M ofproto/pinsched.c
    M ofproto/tunnel.c
    M ovn/controller-vtep/binding.c
    M ovn/controller-vtep/vtep.c
    M ovn/controller/binding.c
    M ovn/controller/chassis.c
    M ovn/controller/lport.h
    M ovn/controller/ofctrl.c
    M ovn/controller/ovn-controller.c
    M ovn/controller/patch.c
    M ovn/controller/physical.c
    M ovn/lib/actions.c
    M ovn/lib/actions.h
    M ovn/lib/expr.c
    M ovn/lib/expr.h
    M ovn/lib/lex.c
    M ovn/lib/ovn-dhcp.h
    M ovn/northd/ovn-northd.c
    M ovn/utilities/ovn-nbctl.c
    M ovn/utilities/ovn-sbctl.c
    M ovsdb/column.c
    M ovsdb/condition.c
    M ovsdb/execution.c
    M ovsdb/file.c
    M ovsdb/jsonrpc-server.c
    M ovsdb/log.c
    M ovsdb/monitor.c
    M ovsdb/mutation.c
    M ovsdb/ovsdb-client.c
    M ovsdb/ovsdb-server.c
    M ovsdb/ovsdb-tool.c
    M ovsdb/ovsdb.c
    M ovsdb/ovsdb.h
    M ovsdb/replication.c
    M ovsdb/replication.h
    M ovsdb/row.c
    M ovsdb/row.h
    M ovsdb/server.h
    M ovsdb/table.c
    M ovsdb/table.h
    M ovsdb/transaction.c
    M ovsdb/trigger.c
    M python/ovs/_json.c
    M tests/test-ccmap.c
    M tests/test-cmap.c
    M tests/test-hmap.c
    M tests/test-json.c
    M tests/test-jsonrpc.c
    M tests/test-ovn.c
    M tests/test-ovsdb.c
    M utilities/ovs-vsctl.c
    M vswitchd/bridge.c
    M vswitchd/system-stats.c
    M vtep/vtep-ctl.c

  Log Message:
  -----------
  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 <twilson at redhat.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>




More information about the git mailing list