X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-discover.c;h=534dd7747a1619b71d30021ce64de8e09b47dcb9;hb=92dbd5c9e3134eabc6e57b397dd18493bc96c9b8;hp=f5da6420519aa43f74d5b09263b67f959fdf1990;hpb=9200fb9ef9a1c55a76e4c4aa789f3fb0a76f0ed1;p=openvswitch diff --git a/utilities/ovs-discover.c b/utilities/ovs-discover.c index f5da6420..534dd774 100644 --- a/utilities/ovs-discover.c +++ b/utilities/ovs-discover.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,9 +33,9 @@ #include "timeval.h" #include "unixctl.h" #include "util.h" - #include "vlog.h" -#define THIS_MODULE VLM_ovs_discover + +VLOG_DEFINE_THIS_MODULE(ovs_discover); struct iface { const char *name; @@ -280,7 +280,8 @@ parse_options(int argc, char *argv[]) OPT_EXIT_WITHOUT_BIND, OPT_EXIT_AFTER_BIND, OPT_NO_DETACH, - VLOG_OPTION_ENUMS + VLOG_OPTION_ENUMS, + DAEMON_OPTION_ENUMS }; static struct option long_options[] = { {"accept-vconn", required_argument, 0, OPT_ACCEPT_VCONN}, @@ -397,6 +398,6 @@ usage(void) "running\n" " -h, --help display this help message\n" " -V, --version display version information\n", - ovs_rundir, program_name); + ovs_rundir(), program_name); exit(EXIT_SUCCESS); }