diff options
72 files changed, 75 insertions, 75 deletions
diff --git a/build-aux/check-vlog-modules b/build-aux/check-vlog-modules index d40c048e9..d6efaa4f5 100755 --- a/build-aux/check-vlog-modules +++ b/build-aux/check-vlog-modules @@ -40,7 +40,7 @@ vlog_modules=` # Get the list of modules defined in some source file. src_modules=` - git grep -h -E '^[ ]*VLOG_DEFINE(_THIS)?_MODULE\([_a-zA-Z0-9]+\)[ ]*$' \ + git grep -h -E '^[ ]*VLOG_DEFINE(_THIS)?_MODULE\([_a-zA-Z0-9]+\);[ ]*$' \ | sed 's/.*(\([_a-zA-Z0-9]\{1,\}\)).*/\1/' \ | LC_ALL=C sort -u \ | xargs echo` diff --git a/lib/backtrace.c b/lib/backtrace.c index d2d1e40e1..282f6b868 100644 --- a/lib/backtrace.c +++ b/lib/backtrace.c @@ -23,7 +23,7 @@ #include "compiler.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(backtrace) +VLOG_DEFINE_THIS_MODULE(backtrace); static uintptr_t OVS_UNUSED get_max_stack(void) diff --git a/lib/coverage.c b/lib/coverage.c index 8a9d0ea69..40af3acde 100644 --- a/lib/coverage.c +++ b/lib/coverage.c @@ -25,7 +25,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(coverage) +VLOG_DEFINE_THIS_MODULE(coverage); static unsigned int epoch; diff --git a/lib/daemon.c b/lib/daemon.c index 91e0404e9..c6489cd5b 100644 --- a/lib/daemon.c +++ b/lib/daemon.c @@ -35,7 +35,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(daemon) +VLOG_DEFINE_THIS_MODULE(daemon); /* --detach: Should we run in the background? */ static bool detach; diff --git a/lib/dhcp-client.c b/lib/dhcp-client.c index 3cd326a08..74fa44c53 100644 --- a/lib/dhcp-client.c +++ b/lib/dhcp-client.c @@ -37,7 +37,7 @@ #include "timeval.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(dhcp_client) +VLOG_DEFINE_THIS_MODULE(dhcp_client); #define DHCLIENT_STATES \ DHCLIENT_STATE(INIT, 1 << 0) \ diff --git a/lib/dhcp.c b/lib/dhcp.c index e6d5735e8..0345efe15 100644 --- a/lib/dhcp.c +++ b/lib/dhcp.c @@ -26,7 +26,7 @@ #include "ofpbuf.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(dhcp) +VLOG_DEFINE_THIS_MODULE(dhcp); /* Information about a DHCP argument type. */ struct arg_type { diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c index b08b6593e..b288cac36 100644 --- a/lib/dpif-linux.c +++ b/lib/dpif-linux.c @@ -43,7 +43,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(dpif_linux) +VLOG_DEFINE_THIS_MODULE(dpif_linux); /* Datapath interface for the openvswitch Linux kernel module. */ struct dpif_linux { diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 3df6598d2..ff71a4a1d 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -47,7 +47,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(dpif_netdev) +VLOG_DEFINE_THIS_MODULE(dpif_netdev); /* Configuration parameters. */ enum { N_QUEUES = 2 }; /* Number of queues for dpif_recv(). */ diff --git a/lib/dpif.c b/lib/dpif.c index a7706e4e7..2cf6a037a 100644 --- a/lib/dpif.c +++ b/lib/dpif.c @@ -39,7 +39,7 @@ #include "valgrind.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(dpif) +VLOG_DEFINE_THIS_MODULE(dpif); static const struct dpif_class *base_dpif_classes[] = { #ifdef HAVE_NETLINK diff --git a/lib/entropy.c b/lib/entropy.c index b844d64ae..8a6479bef 100644 --- a/lib/entropy.c +++ b/lib/entropy.c @@ -24,7 +24,7 @@ #include "socket-util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(entropy) +VLOG_DEFINE_THIS_MODULE(entropy); static const char urandom[] = "/dev/urandom"; diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c index 3f118f8aa..81f8f2844 100644 --- a/lib/fatal-signal.c +++ b/lib/fatal-signal.c @@ -30,7 +30,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(fatal_signal) +VLOG_DEFINE_THIS_MODULE(fatal_signal); /* Signals to catch. */ static const int fatal_signals[] = { SIGTERM, SIGINT, SIGHUP, SIGALRM }; diff --git a/lib/flow.c b/lib/flow.c index e930a6a4c..22ffd1a4d 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -31,7 +31,7 @@ #include "unaligned.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(flow) +VLOG_DEFINE_THIS_MODULE(flow); static struct arp_eth_header * pull_arp(struct ofpbuf *packet) diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c index 22579e0a6..52e977236 100644 --- a/lib/jsonrpc.c +++ b/lib/jsonrpc.c @@ -34,7 +34,7 @@ #include "timeval.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(jsonrpc) +VLOG_DEFINE_THIS_MODULE(jsonrpc); struct jsonrpc { struct stream *stream; diff --git a/lib/leak-checker.c b/lib/leak-checker.c index 28beb0b3c..8b7818244 100644 --- a/lib/leak-checker.c +++ b/lib/leak-checker.c @@ -20,7 +20,7 @@ #include "backtrace.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(leak_checker) +VLOG_DEFINE_THIS_MODULE(leak_checker); #ifndef HAVE_MALLOC_HOOKS void diff --git a/lib/learning-switch.c b/lib/learning-switch.c index 9ed725a7a..63edc0fb8 100644 --- a/lib/learning-switch.c +++ b/lib/learning-switch.c @@ -40,7 +40,7 @@ #include "vconn.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(learning_switch) +VLOG_DEFINE_THIS_MODULE(learning_switch); struct lswitch_port { struct hmap_node hmap_node; /* Hash node for port number. */ diff --git a/lib/lockfile.c b/lib/lockfile.c index 690caf9f2..f056502de 100644 --- a/lib/lockfile.c +++ b/lib/lockfile.c @@ -31,7 +31,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(lockfile) +VLOG_DEFINE_THIS_MODULE(lockfile); struct lockfile { struct hmap_node hmap_node; diff --git a/lib/mac-learning.c b/lib/mac-learning.c index 362347010..9de338c67 100644 --- a/lib/mac-learning.c +++ b/lib/mac-learning.c @@ -31,7 +31,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(mac_learning) +VLOG_DEFINE_THIS_MODULE(mac_learning); /* Returns the number of seconds since 'e' was last learned. */ int diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index 6fb3f5275..0c5ba8b85 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -63,7 +63,7 @@ #include "svec.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(netdev_linux) +VLOG_DEFINE_THIS_MODULE(netdev_linux); /* These were introduced in Linux 2.6.14, so they might be missing if we have * old headers. */ diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index 1672a9bed..d0b5e905a 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -32,7 +32,7 @@ #include "socket-util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(netdev_vport) +VLOG_DEFINE_THIS_MODULE(netdev_vport); struct netdev_vport_notifier { struct netdev_notifier notifier; diff --git a/lib/netdev.c b/lib/netdev.c index a74d5d482..5cd252c3a 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -40,7 +40,7 @@ #include "svec.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(netdev) +VLOG_DEFINE_THIS_MODULE(netdev); static struct shash netdev_classes = SHASH_INITIALIZER(&netdev_classes); diff --git a/lib/netlink.c b/lib/netlink.c index 66c27b1fb..0d072d089 100644 --- a/lib/netlink.c +++ b/lib/netlink.c @@ -33,7 +33,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(netlink) +VLOG_DEFINE_THIS_MODULE(netlink); /* Linux header file confusion causes this to be undefined. */ #ifndef SOL_NETLINK diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index 1f198e9cd..d563a4e44 100644 --- a/lib/ofp-parse.c +++ b/lib/ofp-parse.c @@ -32,7 +32,7 @@ #include "vconn.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(ofp_parse) +VLOG_DEFINE_THIS_MODULE(ofp_parse); static uint32_t str_to_u32(const char *str) diff --git a/lib/ofp-util.c b/lib/ofp-util.c index db8a49d03..933eaf430 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -25,7 +25,7 @@ #include "random.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(ofp_util) +VLOG_DEFINE_THIS_MODULE(ofp_util); /* Rate limit for OpenFlow message parse errors. These always indicate a bug * in the peer and so there's not much point in showing a lot of them. */ diff --git a/lib/ovsdb-error.c b/lib/ovsdb-error.c index 5eb4ec7bd..db8019f38 100644 --- a/lib/ovsdb-error.c +++ b/lib/ovsdb-error.c @@ -25,7 +25,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(ovsdb_error) +VLOG_DEFINE_THIS_MODULE(ovsdb_error); struct ovsdb_error { const char *tag; /* String for "error" member. */ diff --git a/lib/ovsdb-idl.c b/lib/ovsdb-idl.c index cffc5dc12..46cc51ee7 100644 --- a/lib/ovsdb-idl.c +++ b/lib/ovsdb-idl.c @@ -36,7 +36,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(ovsdb_idl) +VLOG_DEFINE_THIS_MODULE(ovsdb_idl); /* An arc from one idl_row to another. When row A contains a UUID that * references row B, this is represented by an arc from A (the source) to B diff --git a/lib/pcap.c b/lib/pcap.c index cc15411d4..8c52f4834 100644 --- a/lib/pcap.c +++ b/lib/pcap.c @@ -24,7 +24,7 @@ #include "ofpbuf.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(pcap) +VLOG_DEFINE_THIS_MODULE(pcap); struct pcap_hdr { uint32_t magic_number; /* magic number */ diff --git a/lib/poll-loop.c b/lib/poll-loop.c index 6aefc7689..653fdd928 100644 --- a/lib/poll-loop.c +++ b/lib/poll-loop.c @@ -30,7 +30,7 @@ #include "timeval.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(poll_loop) +VLOG_DEFINE_THIS_MODULE(poll_loop); /* An event that will wake the following call to poll_block(). */ struct poll_waiter { diff --git a/lib/process.c b/lib/process.c index 087275b8e..a5f83b46e 100644 --- a/lib/process.c +++ b/lib/process.c @@ -34,7 +34,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(process) +VLOG_DEFINE_THIS_MODULE(process); struct process { struct list node; diff --git a/lib/rconn.c b/lib/rconn.c index 06f36264e..45df35dbe 100644 --- a/lib/rconn.c +++ b/lib/rconn.c @@ -32,7 +32,7 @@ #include "vconn.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(rconn) +VLOG_DEFINE_THIS_MODULE(rconn); #define STATES \ STATE(VOID, 1 << 0) \ diff --git a/lib/reconnect.c b/lib/reconnect.c index 773190bdf..f39b178d7 100644 --- a/lib/reconnect.c +++ b/lib/reconnect.c @@ -23,7 +23,7 @@ #include "poll-loop.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(reconnect) +VLOG_DEFINE_THIS_MODULE(reconnect); #define STATES \ STATE(VOID, 1 << 0) \ diff --git a/lib/rtnetlink.c b/lib/rtnetlink.c index 2e1c17330..bce95ce50 100644 --- a/lib/rtnetlink.c +++ b/lib/rtnetlink.c @@ -29,7 +29,7 @@ #include "ofpbuf.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(rtnetlink) +VLOG_DEFINE_THIS_MODULE(rtnetlink); /* rtnetlink socket. */ static struct nl_sock *notify_sock; diff --git a/lib/socket-util.c b/lib/socket-util.c index 961e00b4a..573e28f1a 100644 --- a/lib/socket-util.c +++ b/lib/socket-util.c @@ -34,7 +34,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(socket_util) +VLOG_DEFINE_THIS_MODULE(socket_util); /* Sets 'fd' to non-blocking mode. Returns 0 if successful, otherwise a * positive errno value. */ diff --git a/lib/stream-fd.c b/lib/stream-fd.c index ef4dc8d91..ad15dca7e 100644 --- a/lib/stream-fd.c +++ b/lib/stream-fd.c @@ -33,7 +33,7 @@ #include "stream.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(stream_fd) +VLOG_DEFINE_THIS_MODULE(stream_fd); /* Active file descriptor stream. */ diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c index 05ba59151..b2a9f8453 100644 --- a/lib/stream-ssl.c +++ b/lib/stream-ssl.c @@ -45,7 +45,7 @@ #include "timeval.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(stream_ssl) +VLOG_DEFINE_THIS_MODULE(stream_ssl); /* Active SSL. */ diff --git a/lib/stream-tcp.c b/lib/stream-tcp.c index d00477732..d92fe3af5 100644 --- a/lib/stream-tcp.c +++ b/lib/stream-tcp.c @@ -32,7 +32,7 @@ #include "stream-fd.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(stream_tcp) +VLOG_DEFINE_THIS_MODULE(stream_tcp); /* Active TCP. */ diff --git a/lib/stream-unix.c b/lib/stream-unix.c index 20aa5b482..955414d57 100644 --- a/lib/stream-unix.c +++ b/lib/stream-unix.c @@ -35,7 +35,7 @@ #include "stream-fd.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(stream_unix) +VLOG_DEFINE_THIS_MODULE(stream_unix); /* Active UNIX socket. */ diff --git a/lib/stream.c b/lib/stream.c index ac0cdb8f3..eb75be8d7 100644 --- a/lib/stream.c +++ b/lib/stream.c @@ -37,7 +37,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(stream) +VLOG_DEFINE_THIS_MODULE(stream); /* State of an active stream.*/ enum stream_state { diff --git a/lib/svec.c b/lib/svec.c index 4a576d475..d576c21d1 100644 --- a/lib/svec.c +++ b/lib/svec.c @@ -24,7 +24,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(svec) +VLOG_DEFINE_THIS_MODULE(svec); void svec_init(struct svec *svec) diff --git a/lib/timeval.c b/lib/timeval.c index cca6fe6a4..d24ba03f7 100644 --- a/lib/timeval.c +++ b/lib/timeval.c @@ -29,7 +29,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(timeval) +VLOG_DEFINE_THIS_MODULE(timeval); /* The clock to use for measuring time intervals. This is CLOCK_MONOTONIC by * preference, but on systems that don't have a monotonic clock we fall back diff --git a/lib/unixctl.c b/lib/unixctl.c index 706b3e309..6abb3328d 100644 --- a/lib/unixctl.c +++ b/lib/unixctl.c @@ -42,7 +42,7 @@ #include <time.h> #endif -VLOG_DEFINE_THIS_MODULE(unixctl) +VLOG_DEFINE_THIS_MODULE(unixctl); struct unixctl_command { unixctl_cb_func *cb; diff --git a/lib/util.c b/lib/util.c index e8f3adb78..39ca3b54b 100644 --- a/lib/util.c +++ b/lib/util.c @@ -25,7 +25,7 @@ #include "coverage.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(util) +VLOG_DEFINE_THIS_MODULE(util); const char *program_name; diff --git a/lib/vconn-stream.c b/lib/vconn-stream.c index ba1cec665..82854e911 100644 --- a/lib/vconn-stream.c +++ b/lib/vconn-stream.c @@ -34,7 +34,7 @@ #include "vconn.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(vconn_stream) +VLOG_DEFINE_THIS_MODULE(vconn_stream); /* Active stream socket vconn. */ diff --git a/lib/vconn.c b/lib/vconn.c index ec0ac4e15..d2a3829f3 100644 --- a/lib/vconn.c +++ b/lib/vconn.c @@ -38,7 +38,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(vconn) +VLOG_DEFINE_THIS_MODULE(vconn); /* State of an active vconn.*/ enum vconn_state { diff --git a/lib/vlog.c b/lib/vlog.c index 173f21760..377aaa65a 100644 --- a/lib/vlog.c +++ b/lib/vlog.c @@ -33,7 +33,7 @@ #include "unixctl.h" #include "util.h" -VLOG_DEFINE_THIS_MODULE(vlog) +VLOG_DEFINE_THIS_MODULE(vlog); /* Name for each logging level. */ static const char *level_names[VLL_N_LEVELS] = { diff --git a/lib/vlog.h b/lib/vlog.h index a4e143c1b..60b1a3381 100644 --- a/lib/vlog.h +++ b/lib/vlog.h @@ -72,9 +72,9 @@ struct vlog_module { #define VLOG_DEFINE_MODULE(MODULE) \ VLOG_DEFINE_MODULE__(MODULE) \ struct vlog_module *vlog_module_ptr_##MODULE \ - __attribute__((section("vlog_modules"))) = &VLM_##MODULE; + __attribute__((section("vlog_modules"))) = &VLM_##MODULE #else -#define VLOG_DEFINE_MODULE(MODULE) extern struct vlog_module VLM_##MODULE; +#define VLOG_DEFINE_MODULE(MODULE) extern struct vlog_module VLM_##MODULE #endif const char *vlog_get_module_name(const struct vlog_module *); @@ -144,8 +144,8 @@ void vlog_rate_limit(const struct vlog_module *, enum vlog_level, * defines a static variable named THIS_MODULE that points to it, for use with * the convenience macros below. */ #define VLOG_DEFINE_THIS_MODULE(MODULE) \ - VLOG_DEFINE_MODULE(MODULE) \ - static struct vlog_module *const THIS_MODULE = &VLM_##MODULE; + VLOG_DEFINE_MODULE(MODULE); \ + static struct vlog_module *const THIS_MODULE = &VLM_##MODULE /* Convenience macros. These assume that THIS_MODULE points to a "struct * vlog_module" for the current module, as set up by e.g. the diff --git a/ofproto/collectors.c b/ofproto/collectors.c index 69eed5d7d..58d6abbc3 100644 --- a/ofproto/collectors.c +++ b/ofproto/collectors.c @@ -28,7 +28,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(collectors) +VLOG_DEFINE_THIS_MODULE(collectors); struct collectors { int *fds; /* Sockets. */ diff --git a/ofproto/discovery.c b/ofproto/discovery.c index d7189fc6f..1c39e2ae4 100644 --- a/ofproto/discovery.c +++ b/ofproto/discovery.c @@ -33,7 +33,7 @@ #include "stream-ssl.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(discovery) +VLOG_DEFINE_THIS_MODULE(discovery); struct discovery { char *dpif_name; diff --git a/ofproto/fail-open.c b/ofproto/fail-open.c index 2a8fb955f..95af14232 100644 --- a/ofproto/fail-open.c +++ b/ofproto/fail-open.c @@ -32,7 +32,7 @@ #include "vconn.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(fail_open) +VLOG_DEFINE_THIS_MODULE(fail_open); /* * Fail-open mode. diff --git a/ofproto/in-band.c b/ofproto/in-band.c index c86e7e716..639f9f55a 100644 --- a/ofproto/in-band.c +++ b/ofproto/in-band.c @@ -37,7 +37,7 @@ #include "timeval.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(in_band) +VLOG_DEFINE_THIS_MODULE(in_band); /* In-band control allows a single network to be used for OpenFlow * traffic and other data traffic. Refer to ovs-vswitchd.conf(5) and diff --git a/ofproto/netflow.c b/ofproto/netflow.c index 83f71a4e6..af6dda78c 100644 --- a/ofproto/netflow.c +++ b/ofproto/netflow.c @@ -33,7 +33,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(netflow) +VLOG_DEFINE_THIS_MODULE(netflow); #define NETFLOW_V5_VERSION 5 diff --git a/ofproto/ofproto-sflow.c b/ofproto/ofproto-sflow.c index f886b1b09..04e834705 100644 --- a/ofproto/ofproto-sflow.c +++ b/ofproto/ofproto-sflow.c @@ -34,7 +34,7 @@ #include "timeval.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(sflow) +VLOG_DEFINE_THIS_MODULE(sflow); struct ofproto_sflow_port { struct hmap_node hmap_node; /* In struct ofproto_sflow's "ports" hmap. */ diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 147c7f227..98f6d486f 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -60,7 +60,7 @@ #include "vconn.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(ofproto) +VLOG_DEFINE_THIS_MODULE(ofproto); #include "sflow_api.h" diff --git a/ofproto/pktbuf.c b/ofproto/pktbuf.c index aa9029542..14781c11d 100644 --- a/ofproto/pktbuf.c +++ b/ofproto/pktbuf.c @@ -26,7 +26,7 @@ #include "vconn.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(pktbuf) +VLOG_DEFINE_THIS_MODULE(pktbuf); /* Buffers are identified by a 32-bit opaque ID. We divide the ID * into a buffer number (low bits) and a cookie (high bits). The buffer number diff --git a/ofproto/status.c b/ofproto/status.c index e4834d84b..27db4980f 100644 --- a/ofproto/status.c +++ b/ofproto/status.c @@ -35,7 +35,7 @@ #include "vconn.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(status) +VLOG_DEFINE_THIS_MODULE(status); struct status_category { struct list node; diff --git a/ovsdb/file.c b/ovsdb/file.c index ddb443a11..d09395c4c 100644 --- a/ovsdb/file.c +++ b/ovsdb/file.c @@ -38,7 +38,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(ovsdb_file) +VLOG_DEFINE_THIS_MODULE(ovsdb_file); /* Minimum number of milliseconds between database compactions. */ #define COMPACT_MIN_MSEC (10 * 60 * 1000) /* 10 minutes. */ diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c index d58f9dc17..3c439ee62 100644 --- a/ovsdb/jsonrpc-server.c +++ b/ovsdb/jsonrpc-server.c @@ -36,7 +36,7 @@ #include "trigger.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(ovsdb_jsonrpc_server) +VLOG_DEFINE_THIS_MODULE(ovsdb_jsonrpc_server); struct ovsdb_jsonrpc_remote; struct ovsdb_jsonrpc_session; diff --git a/ovsdb/log.c b/ovsdb/log.c index b532f7c0a..c0be5f5d6 100644 --- a/ovsdb/log.c +++ b/ovsdb/log.c @@ -35,7 +35,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(ovsdb_log) +VLOG_DEFINE_THIS_MODULE(ovsdb_log); enum ovsdb_log_mode { OVSDB_LOG_READ, diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c index 326e3b1a5..aaee5dbf8 100644 --- a/ovsdb/ovsdb-client.c +++ b/ovsdb/ovsdb-client.c @@ -43,7 +43,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(ovsdb_client) +VLOG_DEFINE_THIS_MODULE(ovsdb_client); /* --format: Output formatting. */ static enum { diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index e0c9690df..45d7a774d 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -47,7 +47,7 @@ #include "unixctl.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(ovsdb_server) +VLOG_DEFINE_THIS_MODULE(ovsdb_server); #if HAVE_OPENSSL /* SSL configuration. */ diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c index f4bb701d1..5eeb28fa4 100644 --- a/ovsdb/ovsdb-tool.c +++ b/ovsdb/ovsdb-tool.c @@ -36,7 +36,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(ovsdb_tool) +VLOG_DEFINE_THIS_MODULE(ovsdb_tool); /* -m, --more: Verbosity level for "show-log" command output. */ static int show_log_verbosity; diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c index 26a1fc3f5..1be84f787 100644 --- a/utilities/ovs-controller.c +++ b/utilities/ovs-controller.c @@ -41,7 +41,7 @@ #include "vconn.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(controller) +VLOG_DEFINE_THIS_MODULE(controller); #define MAX_SWITCHES 16 #define MAX_LISTENERS 16 diff --git a/utilities/ovs-discover.c b/utilities/ovs-discover.c index 7cd1edf10..0feaa0f5c 100644 --- a/utilities/ovs-discover.c +++ b/utilities/ovs-discover.c @@ -35,7 +35,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(ovs_discover) +VLOG_DEFINE_THIS_MODULE(ovs_discover); struct iface { const char *name; diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c index c588221d9..04f6c3166 100644 --- a/utilities/ovs-dpctl.c +++ b/utilities/ovs-dpctl.c @@ -42,7 +42,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(dpctl) +VLOG_DEFINE_THIS_MODULE(dpctl); static const struct command all_commands[]; diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index cf6a8a305..17dafaafd 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -46,7 +46,7 @@ #include "vconn.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(ofctl) +VLOG_DEFINE_THIS_MODULE(ofctl); #define MOD_PORT_CMD_UP "up" diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c index 45333fd14..75413f388 100644 --- a/utilities/ovs-openflowd.c +++ b/utilities/ovs-openflowd.c @@ -46,7 +46,7 @@ #include "vconn.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(openflowd) +VLOG_DEFINE_THIS_MODULE(openflowd); /* Settings that may be configured by the user. */ struct ofsettings { diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index c4f628e12..f4f5c94fc 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -43,7 +43,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(vsctl) +VLOG_DEFINE_THIS_MODULE(vsctl); /* vsctl_fatal() also logs the error, so it is preferred in this file. */ #define ovs_fatal please_use_vsctl_fatal_instead_of_ovs_fatal diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 20cfef7df..53a24e36e 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -68,7 +68,7 @@ #include "vlog.h" #include "sflow_api.h" -VLOG_DEFINE_THIS_MODULE(bridge) +VLOG_DEFINE_THIS_MODULE(bridge); struct dst { uint16_t vlan; diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c index 39c110134..6feeda054 100644 --- a/vswitchd/ovs-brcompatd.c +++ b/vswitchd/ovs-brcompatd.c @@ -57,7 +57,7 @@ #include "vlog.h" #include "vswitchd/vswitch-idl.h" -VLOG_DEFINE_THIS_MODULE(brcompatd) +VLOG_DEFINE_THIS_MODULE(brcompatd); /* xxx Just hangs if datapath is rmmod/insmod. Learn to reconnect? */ diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 541cdcbc8..c307c9286 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -48,7 +48,7 @@ #include "vlog.h" #include "vswitchd/vswitch-idl.h" -VLOG_DEFINE_THIS_MODULE(vswitchd) +VLOG_DEFINE_THIS_MODULE(vswitchd); static unixctl_cb_func ovs_vswitchd_exit; diff --git a/vswitchd/proc-net-compat.c b/vswitchd/proc-net-compat.c index 0eda6d258..d8160f45f 100644 --- a/vswitchd/proc-net-compat.c +++ b/vswitchd/proc-net-compat.c @@ -33,7 +33,7 @@ #include "svec.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(proc_net_compat) +VLOG_DEFINE_THIS_MODULE(proc_net_compat); /* Netlink socket to bridge compatibility kernel module. */ static struct nl_sock *brc_sock; diff --git a/vswitchd/system-stats.c b/vswitchd/system-stats.c index 11b2fbedb..45b8cce64 100644 --- a/vswitchd/system-stats.c +++ b/vswitchd/system-stats.c @@ -39,7 +39,7 @@ #include "timeval.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(system_stats) +VLOG_DEFINE_THIS_MODULE(system_stats); /* #ifdefs make it a pain to maintain code: you have to try to build both ways. * Thus, this file tries to compile as much of the code as possible regardless diff --git a/vswitchd/xenserver.c b/vswitchd/xenserver.c index 976d7162c..eed798f41 100644 --- a/vswitchd/xenserver.c +++ b/vswitchd/xenserver.c @@ -24,7 +24,7 @@ #include "process.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(xenserver) +VLOG_DEFINE_THIS_MODULE(xenserver); static char * read_host_uuid(void) |