summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Di Proietto <diproiettod@vmware.com>2017-01-11 23:59:57 -0800
committerDaniele Di Proietto <diproiettod@vmware.com>2017-01-12 09:45:17 -0800
commitc296d3f8396b4bd17d7b4d589da860b9332b9c88 (patch)
tree29ba9ef9584e8645be6e122fa182af00536cd93f
parent2d9b49dd92bfbd040da5ad60b84d0629a355b099 (diff)
downloadopenvswitch-c296d3f8396b4bd17d7b4d589da860b9332b9c88.tar.gz
netdev-vport: Do not log empty warnings on success.
set_tunnel_config() always logs a warning, even on success. This shouldn't happen. Without this, some unit tests fail. Fixes: 9fff138ec3a6("netdev: Add 'errp' to set_config().") Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com> Acked-by: Antonio Fischetti <antonio.fischetti@intel.com> Acked-by: Ben Pfaff <blp@ovn.org>
-rw-r--r--lib/netdev-vport.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index ad5ffcc81..4c2ced50a 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -561,10 +561,12 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args, char **errp)
err = 0;
out:
- ds_chomp(&errors, '\n');
- VLOG_WARN("%s", ds_cstr(&errors));
- if (err) {
- *errp = ds_steal_cstr(&errors);
+ if (errors.length) {
+ ds_chomp(&errors, '\n');
+ VLOG_WARN("%s", ds_cstr(&errors));
+ if (err) {
+ *errp = ds_steal_cstr(&errors);
+ }
}
ds_destroy(&errors);