tailq: remove unneeded inclusions

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

diff --git a/examples/vhost_xen/xenstore_parse.c b/examples/vhost_xen/xenstore_parse.c
index b8acd3e..eb629e2 100644 (file)
--- 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 *
@@ -248,8 +247,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;
 
@@ -400,7 +399,7 @@ parse_mpool_va(struct xen_mempool *mempool)
        int ret = -1;
 
        errno = 0;
-       rte_snprintf(path, sizeof(path),
+       snprintf(path, sizeof(path),
                XEN_VM_ROOTNODE_FMT"/%d_"XEN_GVA_SUFFIX,
                mempool->dom_id, mempool->pool_idx);
 
@@ -484,7 +483,7 @@ parse_mempoolnode(struct xen_guest *guest)
 
        while (1) {
                /* check if null terminated */
-               rte_snprintf(path, sizeof(path),
+               snprintf(path, sizeof(path),
                        XEN_VM_ROOTNODE_FMT"/%d_"XEN_MEMPOOL_SUFFIX,
                        guest->dom_id,
                        guest->pool_num);
@@ -541,7 +540,7 @@ xen_map_vringflag(struct xen_vring *vring)
        int pg_sz = getpagesize();
        char *end;
 
-       rte_snprintf(path, sizeof(path),
+       snprintf(path, sizeof(path),
                XEN_VM_ROOTNODE_FMT"/%d_"XEN_VRINGFLAG_SUFFIX,
                vring->dom_id, vring->virtio_idx);
 
@@ -669,14 +668,15 @@ xen_parse_etheraddr(struct xen_vring *vring)
        uint32_t len;
        int ret = -1;
 
-       rte_snprintf(path, sizeof(path),
+       snprintf(path, sizeof(path),
                XEN_VM_ROOTNODE_FMT"/%d_"XEN_ADDR_SUFFIX,
                vring->dom_id, vring->virtio_idx);
 
        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:
@@ -695,7 +695,7 @@ parse_vringnode(struct xen_guest *guest, uint32_t virtio_idx)
        struct xen_vring *vring = NULL;
 
        /*check if null terminated */
-       rte_snprintf(path, sizeof(path),
+       snprintf(path, sizeof(path),
                XEN_VM_ROOTNODE_FMT"/%d_"XEN_RXVRING_SUFFIX,
                guest->dom_id,
                virtio_idx);
@@ -706,7 +706,7 @@ parse_vringnode(struct xen_guest *guest, uint32_t virtio_idx)
                goto err;
 
        /*check if null terminated */
-       rte_snprintf(path, sizeof(path),
+       snprintf(path, sizeof(path),
                XEN_VM_ROOTNODE_FMT"/%d_"XEN_TXVRING_SUFFIX,
                guest->dom_id,
                virtio_idx);