Imported Upstream version 16.07.2

[deb_dpdk.git] / drivers / net / virtio / virtio_user_ethdev.c

diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index daef09b..bba7402 100644 (file)
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -313,6 +313,17 @@ virtio_user_eth_dev_alloc(const char *name)
        return eth_dev;
 }
 
+static void
+virtio_user_eth_dev_free(struct rte_eth_dev *eth_dev)
+{
+       struct rte_eth_dev_data *data = eth_dev->data;
+       struct virtio_hw *hw = data->dev_private;
+
+       rte_free(hw->virtio_user_dev);
+       rte_free(hw);
+       rte_eth_dev_release_port(eth_dev);
+}
+
 /* Dev initialization routine. Invoked once for each virtio vdev at
  * EAL init time, see rte_eal_dev_init().
  * Returns 0 on success.
@@ -343,9 +354,8 @@ virtio_user_pmd_devinit(const char *name, const char *params)
        }
 
        if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_PATH) == 1) {
-               ret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_PATH,
-                                        &get_string_arg, &path);
-               if (ret < 0) {
+               if (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_PATH,
+                                      &get_string_arg, &path) < 0) {
                        PMD_INIT_LOG(ERR, "error to parse %s",
                                     VIRTIO_USER_ARG_PATH);
                        goto end;
@@ -357,9 +367,8 @@ virtio_user_pmd_devinit(const char *name, const char *params)
        }
 
        if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_MAC) == 1) {
-               ret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_MAC,
-                                        &get_string_arg, &mac_addr);
-               if (ret < 0) {
+               if (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_MAC,
+                                      &get_string_arg, &mac_addr) < 0) {
                        PMD_INIT_LOG(ERR, "error to parse %s",
                                     VIRTIO_USER_ARG_MAC);
                        goto end;
@@ -367,9 +376,8 @@ virtio_user_pmd_devinit(const char *name, const char *params)
        }
 
        if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_QUEUE_SIZE) == 1) {
-               ret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_QUEUE_SIZE,
-                                        &get_integer_arg, &queue_size);
-               if (ret < 0) {
+               if (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_QUEUE_SIZE,
+                                      &get_integer_arg, &queue_size) < 0) {
                        PMD_INIT_LOG(ERR, "error to parse %s",
                                     VIRTIO_USER_ARG_QUEUE_SIZE);
                        goto end;
@@ -377,9 +385,8 @@ virtio_user_pmd_devinit(const char *name, const char *params)
        }
 
        if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_QUEUES_NUM) == 1) {
-               ret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_QUEUES_NUM,
-                                        &get_integer_arg, &queues);
-               if (ret < 0) {
+               if (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_QUEUES_NUM,
+                                      &get_integer_arg, &queues) < 0) {
                        PMD_INIT_LOG(ERR, "error to parse %s",
                                     VIRTIO_USER_ARG_QUEUES_NUM);
                        goto end;
@@ -387,9 +394,8 @@ virtio_user_pmd_devinit(const char *name, const char *params)
        }
 
        if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_CQ_NUM) == 1) {
-               ret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_CQ_NUM,
-                                        &get_integer_arg, &cq);
-               if (ret < 0) {
+               if (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_CQ_NUM,
+                                      &get_integer_arg, &cq) < 0) {
                        PMD_INIT_LOG(ERR, "error to parse %s",
                                     VIRTIO_USER_ARG_CQ_NUM);
                        goto end;
@@ -411,12 +417,16 @@ virtio_user_pmd_devinit(const char *name, const char *params)
 
        hw = eth_dev->data->dev_private;
        if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
-                                queue_size, mac_addr) < 0)
+                                queue_size, mac_addr) < 0) {
+               PMD_INIT_LOG(ERR, "virtio_user_dev_init fails");
+               virtio_user_eth_dev_free(eth_dev);
                goto end;
+       }
 
        /* previously called by rte_eal_pci_probe() for physical dev */
        if (eth_virtio_dev_init(eth_dev) < 0) {
                PMD_INIT_LOG(ERR, "eth_virtio_dev_init fails");
+               virtio_user_eth_dev_free(eth_dev);
                goto end;
        }
        ret = 0;