diff options
| author | Ben Pfaff <blp@nicira.com> | 2015-06-13 16:58:49 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2015-06-16 08:21:38 -0700 |
| commit | 8420c7ad4ee9ba244edf3df143a7ffe7c9047c2b (patch) | |
| tree | 726fcd9be27c4e11b08693af188b2f65fb0cebff /vswitchd/ovs-vswitchd.c | |
| parent | 7a82d3056973b2306b91fc2798f2d412f70aa19d (diff) | |
| download | openvswitch-8420c7ad4ee9ba244edf3df143a7ffe7c9047c2b.tar.gz | |
dummy: Introduce new --enable-dummy=system option.
Until now there have been two variants for --enable-dummy:
* --enable-dummy: This adds support for "dummy" dpif and netdev.
* --enable-dummy=override: In addition, this replaces *every* existing
dpif and netdev by the dummy type.
The latter is useful for testing but it defeats the possibility of using
the userspace native tunneling implementation (because all the tunnel
netdevs get replaced by dummy netdevs). Thus, this commit adds a third
variant:
* --enable-dummy=system: This replaces the "system" dpif and netdev
by dummies but leaves the others untouched.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
Diffstat (limited to 'vswitchd/ovs-vswitchd.c')
| -rw-r--r-- | vswitchd/ovs-vswitchd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index a1b33dad9..ba1c6bf0d 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. +/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -204,7 +204,7 @@ parse_options(int argc, char *argv[], char **unixctl_pathp) break; case OPT_ENABLE_DUMMY: - dummy_enable(optarg && !strcmp(optarg, "override")); + dummy_enable(optarg); break; case OPT_DISABLE_SYSTEM: |