net/af_packet: fix memory leak on init failure

[dpdk.git] / drivers / net / vhost / rte_eth_vhost.c

diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c
index f44e6bb..9fbf39f 100644 (file)
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -18,7 +18,7 @@
 
 #include "rte_eth_vhost.h"
 
-static int vhost_logtype;
+RTE_LOG_REGISTER(vhost_logtype, pmd.net.vhost, NOTICE);
 
 #define VHOST_LOG(level, ...) \
        rte_log(RTE_LOG_ ## level, vhost_logtype, __VA_ARGS__)
@@ -1069,16 +1069,14 @@ eth_dev_close(struct rte_eth_dev *dev)
 
        eth_dev_stop(dev);
 
-       rte_vhost_driver_unregister(internal->iface_name);
-
        list = find_internal_resource(internal->iface_name);
-       if (!list)
-               return;
-
-       pthread_mutex_lock(&internal_list_lock);
-       TAILQ_REMOVE(&internal_list, list, next);
-       pthread_mutex_unlock(&internal_list_lock);
-       rte_free(list);
+       if (list) {
+               rte_vhost_driver_unregister(internal->iface_name);
+               pthread_mutex_lock(&internal_list_lock);
+               TAILQ_REMOVE(&internal_list, list, next);
+               pthread_mutex_unlock(&internal_list_lock);
+               rte_free(list);
+       }
 
        if (dev->data->rx_queues)
                for (i = 0; i < dev->data->nb_rx_queues; i++)
@@ -1572,10 +1570,3 @@ RTE_PMD_REGISTER_PARAM_STRING(net_vhost,
        "tso=<0|1> "
        "linear-buffer=<0|1> "
        "ext-buffer=<0|1>");
-
-RTE_INIT(vhost_init_log)
-{
-       vhost_logtype = rte_log_register("pmd.net.vhost");
-       if (vhost_logtype >= 0)
-               rte_log_set_level(vhost_logtype, RTE_LOG_NOTICE);
-}