X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fvhost_xen%2Fxenstore_parse.c;h=ab089f1b7f7ba1753d167c04dd1963e99ec32401;hb=2fe7ab8e6147d192191059c8fc753f0ec9cbaa51;hp=fdd69b2971da94224e1550df79df4337b22afd91;hpb=6f41fe75e2dd8dd38f7bea7b9501edd4f9b72fa5;p=dpdk.git

diff --git a/examples/vhost_xen/xenstore_parse.c b/examples/vhost_xen/xenstore_parse.c
index fdd69b2971..ab089f1b7f 100644
--- a/examples/vhost_xen/xenstore_parse.c
+++ b/examples/vhost_xen/xenstore_parse.c
@@ -49,7 +49,6 @@
 
 #include <rte_common.h>
 #include <rte_memory.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_malloc.h>
 #include <rte_string_fns.h>
@@ -77,7 +76,7 @@ struct grant_node_item {
 } __attribute__((packed));
 
 int cmdline_parse_etheraddr(void *tk, const char *srcbuf,
-			    void *res);
+	void *res, unsigned ressize);
 
 /* Map grant ref refid at addr_ori*/
 static void *
@@ -204,8 +203,7 @@ xen_free_gntnode(struct xen_gntnode *gntnode)
 {
 	if (gntnode == NULL)
 		return;
-	if (gntnode->gnt_info)
-		free(gntnode->gnt_info);
+	free(gntnode->gnt_info);
 	free(gntnode);
 }
 
@@ -248,8 +246,8 @@ parse_gntnode(int dom_id, char *path)
 		goto err;
 	}
 
-	gntnode = (struct xen_gntnode *)calloc(1, sizeof(struct xen_gntnode));
-	gnt = (struct xen_gnt *)calloc(gref_num, sizeof(struct xen_gnt));
+	gntnode = calloc(1, sizeof(struct xen_gntnode));
+	gnt = calloc(gref_num, sizeof(struct xen_gnt));
 	if (gnt == NULL || gntnode == NULL)
 		goto err;
 
@@ -287,19 +285,15 @@ parse_gntnode(int dom_id, char *path)
 	return gntnode;
 
 err:
-	if (gnt)
-		free(gnt);
-	if (gntnode)
-		free(gntnode);
-	if (gref_list)
-		free(gref_list);
-	if (buf)
-		free(buf);
+	free(gnt);
+	free(gntnode);
+	free(gref_list);
+	free(buf);
 	return NULL;
 }
 
 /*
- * This function maps grant node of vring or mbuf pool to a continous virtual address space,
+ * This function maps grant node of vring or mbuf pool to a continuous virtual address space,
  * and returns mapped address, pfn array, index array
  * @param gntnode
  *  Pointer to grant node
@@ -413,8 +407,7 @@ parse_mpool_va(struct xen_mempool *mempool)
 	}
 	ret = 0;
 out:
-	if (buf)
-		free(buf);
+	free(buf);
 	return ret;
 }
 
@@ -461,14 +454,13 @@ cleanup_mempool(struct xen_mempool *mempool)
 	}
 	mempool->pindex = NULL;
 
-	if (mempool->mempfn_tbl)
-		free(mempool->mempfn_tbl);
+	free(mempool->mempfn_tbl);
 	mempool->mempfn_tbl = NULL;
 }
 
 /*
  * process mempool node idx#_mempool_gref, idx = 0, 1, 2...
- * untill we encounter a node that doesn't exist.
+ * until we encounter a node that doesn't exist.
  */
 int
 parse_mempoolnode(struct xen_guest *guest)
@@ -560,8 +552,7 @@ xen_map_vringflag(struct xen_vring *vring)
 	free(buf);
 	return 0;
 err:
-	if (buf)
-		free(buf);
+	free(buf);
 	if (vring->flag) {
 		munmap(vring->flag, pg_sz);
 		vring->flag = NULL;
@@ -623,8 +614,7 @@ cleanup_vring(struct xen_vring *vring)
 	}
 	vring->rx_pindex = NULL;
 
-	if (vring->rxpfn_tbl)
-		free(vring->rxpfn_tbl);
+	free(vring->rxpfn_tbl);
 	vring->rxpfn_tbl = NULL;
 
 	if (vring->txvring_addr) {
@@ -645,8 +635,7 @@ cleanup_vring(struct xen_vring *vring)
 	}
 	vring->tx_pindex = NULL;
 
-	if (vring->txpfn_tbl)
-		free(vring->txpfn_tbl);
+	free(vring->txpfn_tbl);
 	vring->txpfn_tbl = NULL;
 
 	if (vring->flag) {
@@ -676,12 +665,12 @@ xen_parse_etheraddr(struct xen_vring *vring)
 	if ((buf = xen_read_node(path, &len)) == NULL)
 		goto out;
 
-	if (cmdline_parse_etheraddr(NULL, buf, &vring->addr) < 0)
+	if (cmdline_parse_etheraddr(NULL, buf, &vring->addr,
+			sizeof(vring->addr)) < 0)
 		goto out;
 	ret = 0;
 out:
-	if (buf)
-		free(buf);
+	free(buf);
 	return ret;
 }