[ovs-git] [openvswitch/ovs] 0c87e0: netdev-windows: Fix broken compilation.

GitHub noreply at github.com
Tue Mar 17 15:51:13 UTC 2015


  Branch: refs/heads/ovn
  Home:   https://github.com/openvswitch/ovs
  Commit: 0c87e03dff7fc61b9d066beb42511846354ad35b
      https://github.com/openvswitch/ovs/commit/0c87e03dff7fc61b9d066beb42511846354ad35b
  Author: Gurucharan Shetty <shettyg at nicira.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M lib/netdev-windows.c

  Log Message:
  -----------
  netdev-windows: Fix broken compilation.

Commit 6fd6ed71cb9f(ofpbuf: Simplify ofpbuf API.) removed ofpbuf_size
and ofpbuf_data. They still had reference from netdev-windows. Fix them.

Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: 8f07d902f124d0cf0cebcf3c2aea09183d2699e0
      https://github.com/openvswitch/ovs/commit/8f07d902f124d0cf0cebcf3c2aea09183d2699e0
  Author: Gurucharan Shetty <shettyg at nicira.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M include/windows/syslog.h

  Log Message:
  -----------
  windows/syslog: Remove duplicate definition.

Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: 9d82156981bfcbf539ff80938c7d3b90bc3a8ab2
      https://github.com/openvswitch/ovs/commit/9d82156981bfcbf539ff80938c7d3b90bc3a8ab2
  Author: Justin Pettit <jpettit at nicira.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M lib/.gitignore
    M lib/automake.mk
    R lib/vtep-idl.ann
    M vtep/.gitignore
    M vtep/automake.mk
    M vtep/vtep-ctl.c
    A vtep/vtep-idl.ann

  Log Message:
  -----------
  vtep: Move vtep IDL files into new "libvtep.la".

There's no reason to build it in "lib" and include it in
"libopenvswitch.la".  This commit moves it to "vtep" and includes it in
a new "libvtep.la".

Signed-off-by: Justin Pettit <jpettit at nicira.com>


  Commit: bb50a6979b4973ff552c9c8ac2a70bb000dd4a6b
      https://github.com/openvswitch/ovs/commit/bb50a6979b4973ff552c9c8ac2a70bb000dd4a6b
  Author: Ben Pfaff <blp at nicira.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M FAQ.md

  Log Message:
  -----------
  FAQ.md: Explain why "ovs-vsctl show" shows a port but it isn't there.

I've explained this a lot over the years.

Signed-off-by: Ben Pfaff <blp at nicira.com>
Acked-by: Gurucharan Shetty <gshetty at nicira.com>


  Commit: 7af77bbd045707d6036578d40db3dec45242405a
      https://github.com/openvswitch/ovs/commit/7af77bbd045707d6036578d40db3dec45242405a
  Author: Ben Pfaff <blp at nicira.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M vswitchd/bridge.c

  Log Message:
  -----------
  bridge: Enable RSTP if both STP and RSTP are enabled.

Until now, if both STP and RSTP were enabled, ovs-vswitchd would actually
enable only the one it first noticed to be enabled, and actually turn off
the setting for the other one in the database (!).  This doesn't match
ovs-vswitchd behavior for other contradictory configurations, so this
commit changes its behavior so that, if both are enabled, RSTP takes
precedence.

Reported-by: Daniele Venturino <daniele.venturino at m3s.it>
Signed-off-by: Ben Pfaff <blp at nicira.com>
Acked-by: Ansis Atteka <aatteka at nicira.com>


  Commit: 973edd6eafb05d7a27c99b6efb7e410e96d8cb96
      https://github.com/openvswitch/ovs/commit/973edd6eafb05d7a27c99b6efb7e410e96d8cb96
  Author: Daniele Di Proietto <diproiettod at vmware.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M configure.ac
    M vtep/automake.mk
    A vtep/libvtep.sym.in

  Log Message:
  -----------
  vtep: fix '--enable-shared' build and 'make distcheck'.

Found by travis.  Broken by commit 9d8215698 ('vtep: Move vtep IDL files
into new "libvtep.la".')

Signed-off-by: Daniele Di Proietto <diproiettod at vmware.com>
Signed-off-by: Ben Pfaff <blp at nicira.com>


  Commit: 5748c7e9a51748c93bfc511662462be415664a8b
      https://github.com/openvswitch/ovs/commit/5748c7e9a51748c93bfc511662462be415664a8b
  Author: Edwin Chiu <echiu at vmware.com>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M AUTHORS
    M INSTALL.XenServer.md
    M xenserver/openvswitch-xen.spec.in

  Log Message:
  -----------
  xenserver: Fix build spec for XenServer 6.5.

The latest XenServer 6.5 uses a new way for kernel version naming.
Therein, the kernel flavor could not be found anymore.  Also, the
directory name in 'lib/modules/' becomes a shortened version of
kernel version. e.g.:

[root at localhost ~]# ls /lib/modules/
3.10.0+2

As a workaround, this commit modifies the spec file to make
%{kernel_flavor} optional and %{xen_version} definable by users.
In the long run, I'd like to spend time refining the spec file.

Signed-off-by: Edwin Chiu <echiu at vmware.com>
Signed-off-by: Alex Wang <alexw at nicira.com>


  Commit: ca60ea494930d0d8b083ccde42ca51cf32a3b266
      https://github.com/openvswitch/ovs/commit/ca60ea494930d0d8b083ccde42ca51cf32a3b266
  Author: Alex Wang <alexw at nicira.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M xenserver/etc_xapi.d_plugins_openvswitch-cfg-update

  Log Message:
  -----------
  openvswitch-cfg-update: Fix incorrect controller config.

Commit 032c09ddd10 (XenServer: Don't reset on xe-toolstack-restart)
introduced a bug which causes the setting of 'ssl::6632' at xenserver
boot.  Subsequently, at each bridge configuration, ovs will report
'|socket_util|ERR|:6632: bad IPv4 address ""' due to the empty address.

The exact calltrace is:

 0  parse_sockaddr_components (ss=0xbf8dd87c, host_s=0x94c99f0 "",
    port_s=0x94c99f1 "6632", default_port=6632, s=0x948b9dc ":6632")
    at lib/socket-util.c:350
 1  0x081163b5 in inet_parse_active (target_=0x948b9dc ":6632", default_port=
    6632, ss=0xbf8dd87c) at lib/socket-util.c:412
 2  0x08119dcf in stream_parse_target_with_default_port (target=0x948b9d8
    "ssl::6632", default_port=6632, ss=0xbf8dd87c) at lib/stream.c:734
 3  0x0804c946 in collect_in_band_managers (ovs_cfg=0x94433b0,
    managersp=0xbf8dd9a8, n_managersp=0xbf8dd9a0) at vswitchd/bridge.c:516
 4  0x08054b87 in bridge_reconfigure (ovs_cfg=0x94433b0) at vswitchd/bridge.c:
    614
 5  0x080557cf in bridge_run () at vswitchd/bridge.c:2897
 6  0x080564aa in main (argc=155674720, argv=0x0) at vswitchd/ovs-vswitchd.c:
    116

This commit fixes the issue.

Signed-off-by: Alex Wang <alexw at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: 94ace6ffe4d5f0783b308bfc0c7da0ff65afb9a9
      https://github.com/openvswitch/ovs/commit/94ace6ffe4d5f0783b308bfc0c7da0ff65afb9a9
  Author: Alex Wang <alexw at nicira.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M tests/completion.at
    M utilities/automake.mk
    A utilities/ovs-appctl-bashcomp.bash
    A utilities/ovs-command-bashcomp.INSTALL.md
    R utilities/ovs-command-compgen.INSTALL.md
    R utilities/ovs-command-compgen.bash

  Log Message:
  -----------
  ovs-appctl-bashcomp: Keep naming consistency.

Before adding the completion script ovs-vsctl-bashcomp.bash for
ovs-vsctl command, this commit renames the ovs-command-compgen.bash
to ovs-appctl-bashcomp.bash to keep the script naming consistent.

Signed-off-by: Alex Wang <alexw at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: 95e4a97a6f68bcc98525e238f73e7924d8645f1b
      https://github.com/openvswitch/ovs/commit/95e4a97a6f68bcc98525e238f73e7924d8645f1b
  Author: Peter Amidon <peter at picnicpark.org>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M AUTHORS
    M utilities/automake.mk
    A utilities/ovs-vsctl-bashcomp.bash
    M utilities/ovs-vsctl.c

  Log Message:
  -----------
  ovs-vsctl-bashcomp: Add bash command-line completion for ovs-vsctl.

This patch adds bash command-line completion script for ovs-vsctl.
Therein, codes are added to ovs-vsctl to allow it to print the
options and command arguments.  The ovs-vsctl-bashcomp.bash will
parse the vsctl command and complete on the user input.

The completion script can do the following::

- display available completions and complete on user input for
  global/local options, sub-commands, and arguments.

- query database and expand keywords like 'table/record/column/key'
  to available completions.

- deal with argument relations like 'one and more', 'zero or one'.

- complete multiple ovs-vsctl commands cascaded via '--'.

To use the script, either copy it inside /etc/bash_completion.d/
or manually run it via . ovs-vsctl-bashcomp.bash.

Signed-off-by: Peter Amidon <peter at picnicpark.org>
Signed-off-by: Alex Wang <alexw at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: 557570fa09ccc1e2a5b76658bc18d2e04e9d7fb6
      https://github.com/openvswitch/ovs/commit/557570fa09ccc1e2a5b76658bc18d2e04e9d7fb6
  Author: Alex Wang <alexw at nicira.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M NEWS
    M tests/completion.at
    M utilities/automake.mk
    M utilities/ovs-command-bashcomp.INSTALL.md

  Log Message:
  -----------
  ovs-vsctl-bashcomp: Documentation and unit tests.

This commit includes the unit tests for ovs-vsctl-bashcomp
and refines the ovs-command-bashcomp.INSTALL.md to introduce
the bash completion for ovs-vsctl.

Signed-off-by: Alex Wang <alexw at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: adb30d640af659b3eb31bdfa1e03c9434aa2671c
      https://github.com/openvswitch/ovs/commit/adb30d640af659b3eb31bdfa1e03c9434aa2671c
  Author: Justin Pettit <jpettit at nicira.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M vswitchd/vswitch.xml

  Log Message:
  -----------
  vswitchd: Update IPv6 controller examples to use OpenFlow port.

The IPv6 examples in ovs-vswitchd.conf.db to configure the OpenFlow port
used the OVSDB port number, which is confusing.

Signed-off-by: Justin Pettit <jpettit at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: d4763d1d4efbbcfd884df2d668980d61ec89d75a
      https://github.com/openvswitch/ovs/commit/d4763d1d4efbbcfd884df2d668980d61ec89d75a
  Author: Justin Pettit <jpettit at nicira.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M FAQ.md
    M INSTALL.Windows.md
    M NEWS
    M debian/openvswitch-testcontroller.default
    M lib/jsonrpc.c
    M lib/jsonrpc.h
    M lib/stream-ssl.c
    M lib/stream.c
    M lib/vconn-active.man
    M lib/vconn-passive.man
    M lib/vconn-stream.c
    M lib/vconn.c
    M ofproto/connmgr.c
    M ovsdb/ovsdb-server.1.in
    M ovsdb/remote-active.man
    M ovsdb/remote-passive.man
    M tests/run-ryu
    M third-party/README.md
    M third-party/ofp-tcpdump.patch
    M utilities/ovs-testcontroller.8.in
    M vswitchd/bridge.c
    M vswitchd/vswitch.xml
    M vtep/README.ovs-vtep.md
    M vtep/vtep.xml
    M xenserver/etc_xapi.d_plugins_openvswitch-cfg-update

  Log Message:
  -----------
  Use the IANA-assigned ports for OpenFlow and OVSDB.

We've been warning about the change since 2.1, which was released a year
ago.

Signed-off-by: Justin Pettit <jpettit at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: 84b7bac83493aa54dff9a1a965bc64a90e44d55f
      https://github.com/openvswitch/ovs/commit/84b7bac83493aa54dff9a1a965bc64a90e44d55f
  Author: Thomas Graf <tgraf at noironetworks.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  travis: Generate new secret key for build at openvswitch.org

Signed-off-by: Thomas Graf <tgraf at noironetworks.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: ce34e37ffe884a8bb353a532dd241726cecfe1f0
      https://github.com/openvswitch/ovs/commit/ce34e37ffe884a8bb353a532dd241726cecfe1f0
  Author: Alex Wang <alexw at nicira.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M tests/completion.at
    M utilities/ovs-vsctl-bashcomp.bash

  Log Message:
  -----------
  ovs-vsctl-bashcomp: Fix build failure when bash version < 4.0.

The ovs-vsctl-bashcomp script does not work properly on bash (version
 < 4.0).  This commit adds test for the bash version and avoids running
the script/test when the bash version is not supported.

Signed-off-by: Alex Wang <alexw at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: f58df86078af10aba97484671db8739769df29f1
      https://github.com/openvswitch/ovs/commit/f58df86078af10aba97484671db8739769df29f1
  Author: Ben Pfaff <blp at nicira.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M FAQ.md

  Log Message:
  -----------
  FAQ.md: Add a few more details on how to support a new field.

Signed-off-by: Ben Pfaff <blp at nicira.com>
Acked-by: Thomas Graf <tgraf at noironetworks.com>


  Commit: 657ac953c9a0bbec23f1bec6a0c26737e06e5bcb
      https://github.com/openvswitch/ovs/commit/657ac953c9a0bbec23f1bec6a0c26737e06e5bcb
  Author: Jarno Rajahalme <jrajahalme at nicira.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M lib/odp-util.c

  Log Message:
  -----------
  odp-util: Fix scanning of recirc_id.

Recirculation id was scanned without a mask, which led to it being
ignored.

Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: 18287cd35ebaffb9122e08b29832bc52e1608cda
      https://github.com/openvswitch/ovs/commit/18287cd35ebaffb9122e08b29832bc52e1608cda
  Author: Jarno Rajahalme <jrajahalme at nicira.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M lib/ofp-actions.h

  Log Message:
  -----------
  ofp-actions: Align struct ofpact to OFPACT_ALIGNTO.

We already assume this alignment, let the compiler know it, too.

As a side-effect the sizeof(struct ofpact) also changes to
OFPACT_ALIGNTO, which should be fine.

Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: 8b1e55603f2541227b2e0cc1936dc107f83604a6
      https://github.com/openvswitch/ovs/commit/8b1e55603f2541227b2e0cc1936dc107f83604a6
  Author: Jarno Rajahalme <jrajahalme at nicira.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M ofproto/ofproto-dpif-xlate.c

  Log Message:
  -----------
  ofproto-dpif-xlate: Add rule cookie to the tranlation context.

This is needed for unrolling resubmits for after-recirculation actions
introduced by the following patch.

Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: 7b7dcc762bb2056757d22b31c611060eda055d9a
      https://github.com/openvswitch/ovs/commit/7b7dcc762bb2056757d22b31c611060eda055d9a
  Author: Jarno Rajahalme <jrajahalme at nicira.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M ofproto/ofproto-dpif-xlate.c
    M ofproto/ofproto-dpif.c
    M ofproto/tunnel.c

  Log Message:
  -----------
  ofproto-dpif-xlate: Honor skip_wildcards in translation.

There is no need to do anything with wildcards when skip_wildcards is true.

Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: 9e0fa1f23861fc917b5b56bbee6864ba7f1b8756
      https://github.com/openvswitch/ovs/commit/9e0fa1f23861fc917b5b56bbee6864ba7f1b8756
  Author: Russell Bryant <rbryant at redhat.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M tests/ovstest.h

  Log Message:
  -----------
  ovstest: Fix a typo in a comment.

Fix a typo in an example of invoking 'ovstest' in a comment.

Signed-off-by: Russell Bryant <rbryant at redhat.com>
Signed-off-by: Ben Pfaff <blp at nicira.com>


  Commit: 5f38375100dd1001c60b31aeb519d15b3b342d1b
      https://github.com/openvswitch/ovs/commit/5f38375100dd1001c60b31aeb519d15b3b342d1b
  Author: Russell Bryant <rbryant at redhat.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M lib/command-line.c
    M lib/command-line.h
    M lib/daemon-unix.c
    M ovsdb/ovsdb-client.c
    M ovsdb/ovsdb-server.c
    M ovsdb/ovsdb-tool.c
    M tests/ovstest.c
    M tests/test-bitmap.c
    M tests/test-classifier.c
    M tests/test-cmap.c
    M tests/test-heap.c
    M tests/test-jsonrpc.c
    M tests/test-netflow.c
    M tests/test-ovsdb.c
    M tests/test-reconnect.c
    M tests/test-sflow.c
    M tests/test-util.c
    M tests/test-vconn.c
    M utilities/ovs-appctl.c
    M utilities/ovs-benchmark.c
    M utilities/ovs-dpctl.c
    M utilities/ovs-ofctl.c
    M utilities/ovs-testcontroller.c
    M utilities/ovs-vlan-bug-workaround.c
    M utilities/ovs-vsctl.c
    M vswitchd/ovs-vswitchd.c
    M vtep/vtep-ctl.c

  Log Message:
  -----------
  command-line: add ovs_cmdl_ prefix

The coding style guidelines include the following:

  - Pick a unique name prefix (ending with an underscore) for each
    module, and apply that prefix to all of that module's externally
    visible names.  Names of macro parameters, struct and union members,
    and parameters in function prototypes are not considered externally
    visible for this purpose.

This patch adds the new prefix to the externally visible names.  This
makes it a bit more obvious what code is coming from common command
line handling code.

Signed-off-by: Russell Bryant <rbryant at redhat.com>
Signed-off-by: Ben Pfaff <blp at nicira.com>


  Commit: 6cc59853b2f4d1955fceb31af916a8e77f0b0248
      https://github.com/openvswitch/ovs/commit/6cc59853b2f4d1955fceb31af916a8e77f0b0248
  Author: Alex Wang <alexw at nicira.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M tests/test-hash.c

  Log Message:
  -----------
  test-hash: Improve comments.

This commit tries to simplify and further clarify the test cases
in test-hash.

Signed-off-by: Alex Wang <alexw at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: ba6f5a6dace90573bc9f610dd894c4178dd69a18
      https://github.com/openvswitch/ovs/commit/ba6f5a6dace90573bc9f610dd894c4178dd69a18
  Author: Alin Serdean <aserdean at cloudbasesolutions.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M tests/.gitignore

  Log Message:
  -----------
  Add testsuite.tmp.orig to .gitignore

Adding the file: tests/testsuite.tmp.orig to tests/.gitignore

Signed-off-by: Alin Gabriel Serdean <aserdean at cloudbasesolutions.com>
Signed-off-by: Ben Pfaff <blp at nicira.com>


  Commit: 6b2b63d08866f81fadac9944c4ef05c87b230047
      https://github.com/openvswitch/ovs/commit/6b2b63d08866f81fadac9944c4ef05c87b230047
  Author: Jarno Rajahalme <jrajahalme at nicira.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M lib/ofp-actions.h

  Log Message:
  -----------
  Revert "ofp-actions: Align struct ofpact to OFPACT_ALIGNTO."

This reverts commit 18287cd35ebaffb9122e08b29832bc52e1608cda.

The alignment, while correct, made also all derived ofpact structs bigger,
which was not intended.

Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>


  Commit: 330de069c5dc0ecc5705a3d9062e0ee2f12b4bff
      https://github.com/openvswitch/ovs/commit/330de069c5dc0ecc5705a3d9062e0ee2f12b4bff
  Author: Jarno Rajahalme <jrajahalme at nicira.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M lib/flow.c
    M lib/match.c
    M tests/dpif-netdev.at
    M tests/ofproto-dpif.at

  Log Message:
  -----------
  match: Do not skip formatting a zero dp_hash.

The dp_hash match should be printed whenever it is being matched.  We
keep the old behavior for flow_format(), which is mostly used to
format PACKET_IN messages. This keeps those messages tidier and avoids
changing a lot of test cases.

Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>
Acked-by: Andy Zhou <azhou at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: 1774d762da192d26f0f1a6176d20358adfe57dd5
      https://github.com/openvswitch/ovs/commit/1774d762da192d26f0f1a6176d20358adfe57dd5
  Author: Jarno Rajahalme <jrajahalme at nicira.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M lib/nx-match.c
    M ofproto/ofproto-dpif-xlate.c
    M tests/ofproto-dpif.at

  Log Message:
  -----------
  ofproto-dpif-xlate: Preserve stack across patch port.

Prevent a peer patch port bridge from popping data off or pushing data
to the stack of the first bridge.

Found by inspection.

Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: 1636c76112b63c50bb586186eb0c3aa16f9541c7
      https://github.com/openvswitch/ovs/commit/1636c76112b63c50bb586186eb0c3aa16f9541c7
  Author: Russell Bryant <rbryant at redhat.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M lib/command-line.c
    M lib/command-line.h
    M ovsdb/ovsdb-tool.c
    M tests/ovstest.c
    M tests/ovstest.h
    M tests/test-bitmap.c
    M tests/test-classifier.c
    M tests/test-cmap.c
    M tests/test-heap.c
    M tests/test-jsonrpc.c
    M tests/test-ovsdb.c
    M tests/test-reconnect.c
    M tests/test-util.c
    M tests/test-vconn.c
    M utilities/ovs-benchmark.c
    M utilities/ovs-ofctl.c

  Log Message:
  -----------
  command-line: add ovs_cmdl_context

I started working on a new command line utility that used this shared
code.  I wanted the ability to pass some data from common
initialization code to all of the commands.  You can find a similar
pattern in ovs-vsctl.

This patch updates the command handler to take a new struct,
ovs_cmdl_context, instead of argc and argv directly.  It includes argc
and argv, but also includes an opaque type (void *), where the user of
this API can attach its custom data it wants passed along to command
handlers.

This patch affected the ovstest sub-programs, as well.  The patch
includes a bit of an odd hack to OVSTEST_REGISTER() to avoid making
the main() function of the sub-programs take a ovs_cmdl_context.
The test main() functions still receive argc and argv directly, as
that seems more natural.  The test-subprograms themselves are able to
make use of a context internally, though.

Signed-off-by: Russell Bryant <rbryant at redhat.com>
Signed-off-by: Ben Pfaff <blp at nicira.com>


  Commit: 40cb2c3229a586cbc3c9792efe2a81f62dc52d95
      https://github.com/openvswitch/ovs/commit/40cb2c3229a586cbc3c9792efe2a81f62dc52d95
  Author: Ben Pfaff <blp at nicira.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M FAQ.md
    M INSTALL.Windows.md
    M INSTALL.XenServer.md
    M NEWS
    M configure.ac
    M debian/openvswitch-testcontroller.default
    M include/windows/syslog.h
    M lib/.gitignore
    M lib/automake.mk
    M lib/command-line.c
    M lib/command-line.h
    M lib/daemon-unix.c
    M lib/flow.c
    M lib/jsonrpc.c
    M lib/jsonrpc.h
    M lib/match.c
    M lib/netdev-windows.c
    M lib/nx-match.c
    M lib/odp-util.c
    M lib/stream-ssl.c
    M lib/stream.c
    M lib/vconn-active.man
    M lib/vconn-passive.man
    M lib/vconn-stream.c
    M lib/vconn.c
    R lib/vtep-idl.ann
    M ofproto/connmgr.c
    M ofproto/ofproto-dpif-xlate.c
    M ofproto/ofproto-dpif.c
    M ofproto/tunnel.c
    M ovsdb/ovsdb-client.c
    M ovsdb/ovsdb-server.1.in
    M ovsdb/ovsdb-server.c
    M ovsdb/ovsdb-tool.c
    M ovsdb/remote-active.man
    M ovsdb/remote-passive.man
    M tests/.gitignore
    M tests/completion.at
    M tests/dpif-netdev.at
    M tests/ofproto-dpif.at
    M tests/ovstest.c
    M tests/ovstest.h
    M tests/run-ryu
    M tests/test-bitmap.c
    M tests/test-classifier.c
    M tests/test-cmap.c
    M tests/test-hash.c
    M tests/test-heap.c
    M tests/test-jsonrpc.c
    M tests/test-netflow.c
    M tests/test-ovsdb.c
    M tests/test-reconnect.c
    M tests/test-sflow.c
    M tests/test-util.c
    M tests/test-vconn.c
    M third-party/README.md
    M third-party/ofp-tcpdump.patch
    M utilities/automake.mk
    A utilities/ovs-appctl-bashcomp.bash
    M utilities/ovs-appctl.c
    M utilities/ovs-benchmark.c
    A utilities/ovs-command-bashcomp.INSTALL.md
    R utilities/ovs-command-compgen.INSTALL.md
    R utilities/ovs-command-compgen.bash
    M utilities/ovs-dpctl.c
    M utilities/ovs-ofctl.c
    M utilities/ovs-testcontroller.8.in
    M utilities/ovs-testcontroller.c
    M utilities/ovs-vlan-bug-workaround.c
    A utilities/ovs-vsctl-bashcomp.bash
    M utilities/ovs-vsctl.c
    M vswitchd/bridge.c
    M vswitchd/ovs-vswitchd.c
    M vswitchd/vswitch.xml
    M vtep/.gitignore
    M vtep/README.ovs-vtep.md
    M vtep/automake.mk
    A vtep/libvtep.sym.in
    M vtep/vtep-ctl.c
    A vtep/vtep-idl.ann
    M vtep/vtep.xml
    M xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
    M xenserver/openvswitch-xen.spec.in

  Log Message:
  -----------
  Merge "master" into "ovn".

This will allow taking advantage of the new command-line infrastructure.


Compare: https://github.com/openvswitch/ovs/compare/ff358c710ca5...40cb2c3229a5


More information about the git mailing list