remove unneeded tests for NULL when freeing

[dpdk.git] / examples / vhost_xen / vhost_monitor.c

diff --git a/examples/vhost_xen/vhost_monitor.c b/examples/vhost_xen/vhost_monitor.c
index b9c1cb5..7cc5c2f 100644 (file)
--- a/examples/vhost_xen/vhost_monitor.c
+++ b/examples/vhost_xen/vhost_monitor.c
@@ -138,7 +138,7 @@ add_xen_guest(int32_t dom_id)
        if ((guest = get_xen_guest(dom_id)) != NULL)
                return guest;
 
-       guest = (struct xen_guest * )calloc(1, sizeof(struct xen_guest));
+       guest = calloc(1, sizeof(struct xen_guest));
        if (guest) {
                RTE_LOG(ERR, XENHOST, "  %s: return newly created guest with %d rings\n", __func__, guest->vring_num);
                TAILQ_INSERT_TAIL(&guest_root, guest, next);
@@ -181,8 +181,8 @@ add_config_ll_entry(struct virtio_net_config_ll *new_ll_dev)
                        ll_root = new_ll_dev;
                } else {
                        /* increment through the ll until we find un unused device_id,
-                        * insert the device at that entry
-                        */
+                        * insert the device at that entry
+                        */
                        while ((ll_dev->next != NULL) && (ll_dev->dev.device_fh == (ll_dev->next->dev.device_fh - 1)))
                                ll_dev = ll_dev->next;
 
@@ -255,8 +255,8 @@ virtio_net_config_ll *new_device(unsigned int virtio_idx, struct xen_guest *gues
 
        /* Setup device and virtqueues. */
        new_ll_dev   = calloc(1, sizeof(struct virtio_net_config_ll));
-       virtqueue_rx = rte_zmalloc(NULL, sizeof(struct vhost_virtqueue), CACHE_LINE_SIZE);
-       virtqueue_tx = rte_zmalloc(NULL, sizeof(struct vhost_virtqueue), CACHE_LINE_SIZE);
+       virtqueue_rx = rte_zmalloc(NULL, sizeof(struct vhost_virtqueue), RTE_CACHE_LINE_SIZE);
+       virtqueue_tx = rte_zmalloc(NULL, sizeof(struct vhost_virtqueue), RTE_CACHE_LINE_SIZE);
        if (new_ll_dev == NULL || virtqueue_rx == NULL || virtqueue_tx == NULL)
                goto err;
 
@@ -296,12 +296,10 @@ virtio_net_config_ll *new_device(unsigned int virtio_idx, struct xen_guest *gues
        add_config_ll_entry(new_ll_dev);
        return new_ll_dev;
 err:
-       if (new_ll_dev)
-               free(new_ll_dev);
-       if (virtqueue_rx)
-               rte_free(virtqueue_rx);
-       if (virtqueue_tx)
-               rte_free(virtqueue_tx);
+       free(new_ll_dev);
+       rte_free(virtqueue_rx);
+       rte_free(virtqueue_tx);
+
        return NULL;
 }
 
@@ -434,8 +432,8 @@ static void virtio_init(void)
                        continue;
 
                for (j = 0; j < RTE_MAX_ETHPORTS; j++) {
-                       rte_snprintf(node, PATH_MAX, "%s%d", VIRTIO_START, j);
-                       rte_snprintf(path, PATH_MAX, XEN_VM_NODE_FMT,
+                       snprintf(node, PATH_MAX, "%s%d", VIRTIO_START, j);
+                       snprintf(path, PATH_MAX, XEN_VM_NODE_FMT,
                                        dom_id, node);
 
                        th = xs_transaction_start(watch.xs);
@@ -591,5 +589,3 @@ init_virtio_xen(struct virtio_net_device_ops const *const ops)
                return -1;
        return 0;
 }
-
-