netdev-dpdk: Don't try to unregister empty vhost_id.

If 'vhost-server-path' not provided for vhostuserclient port, 'netdev_dpdk_vhost_destruct()' will try to unregister an empty string. This leads to error message in log: netdev_dpdk|ERR|vhost2: Unable to unregister vhost driver for socket ''. CC: Ciara Loftus <[email protected]> Fixes: 2d24d16 ("netdev-dpdk: Add new 'dpdkvhostuserclient' port type") Signed-off-by: Ilya Maximets <[email protected]> Acked-by: Ciara Loftus <[email protected]> Signed-off-by: Daniele Di Proietto <[email protected]>
blp · Dec 2, 2016 · 821b866 · 821b866
1 parent 888782c
commit 821b866
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
@@ -1027,13 +1027,18 @@ netdev_dpdk_vhost_destruct(struct netdev *netdev)
     ovs_mutex_unlock(&dev->mutex);
     ovs_mutex_unlock(&dpdk_mutex);
 
+    if (!strlen(dev->vhost_id)) {
+        goto out;
+    }
+
     if (dpdk_vhost_driver_unregister(dev, vhost_id)) {
         VLOG_ERR("%s: Unable to unregister vhost driver for socket '%s'.\n",
                  netdev->name, vhost_id);
     } else if (!(dev->vhost_driver_flags & RTE_VHOST_USER_CLIENT)) {
         /* OVS server mode - remove this socket from list for deletion */
         fatal_signal_remove_file_to_unlink(vhost_id);
     }
+out:
     free(vhost_id);
 }