#include "timeval.h"
#include "unixctl.h"
#include "util.h"
-#include "vconn.h"
-#include "vlog.h"
+#include "openvswitch/vconn.h"
+#include "openvswitch/vlog.h"
#include "lib/vswitch-idl.h"
+#include "lib/netdev-dpdk.h"
VLOG_DEFINE_THIS_MODULE(vswitchd);
static unixctl_cb_func ovs_vswitchd_exit;
static char *parse_options(int argc, char *argv[], char **unixctl_path);
-static void usage(void) NO_RETURN;
+OVS_NO_RETURN static void usage(void);
int
main(int argc, char *argv[])
bool exiting;
int retval;
- proctitle_init(argc, argv);
set_program_name(argv[0]);
+ retval = dpdk_init(argc,argv);
+ argc -= retval;
+ argv += retval;
+
+ proctitle_init(argc, argv);
service_start(&argc, &argv);
remote = parse_options(argc, argv, &unixctl_path);
fatal_ignore_sigpipe();
OPT_BOOTSTRAP_CA_CERT,
OPT_ENABLE_DUMMY,
OPT_DISABLE_SYSTEM,
- OPT_ENABLE_OF14,
- DAEMON_OPTION_ENUMS
+ DAEMON_OPTION_ENUMS,
+ OPT_DPDK,
};
static const struct option long_options[] = {
{"help", no_argument, NULL, 'h'},
{"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
{"enable-dummy", optional_argument, NULL, OPT_ENABLE_DUMMY},
{"disable-system", no_argument, NULL, OPT_DISABLE_SYSTEM},
- {"enable-of14", no_argument, NULL, OPT_ENABLE_OF14},
+ {"dpdk", required_argument, NULL, OPT_DPDK},
{NULL, 0, NULL, 0},
};
char *short_options = long_options_to_short_options(long_options);
dp_blacklist_provider("system");
break;
- case OPT_ENABLE_OF14:
- bridge_enable_of14();
- break;
-
case '?':
exit(EXIT_FAILURE);
+ case OPT_DPDK:
+ ovs_fatal(0, "--dpdk must be given at beginning of command line.");
+ break;
+
default:
abort();
}
stream_usage("DATABASE", true, false, true);
daemon_usage();
vlog_usage();
+ printf("\nDPDK options:\n"
+ " --dpdk options Initialize DPDK datapath.\n");
printf("\nOther options:\n"
" --unixctl=SOCKET override default control socket name\n"
- " --enable-of14 allow enabling OF1.4 (unsafely!)\n"
" -h, --help display this help message\n"
" -V, --version display version information\n");
exit(EXIT_SUCCESS);