add prefix to cache line macros

[dpdk.git] / lib / librte_pmd_xenvirt / rte_eth_xenvirt.c

diff --git a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c b/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c
index 7c4d3fe..6555ec5 100644 (file)
--- a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c
+++ b/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c
@@ -81,7 +81,7 @@ rte_rxmbuf_alloc(struct rte_mempool *mp)
        struct rte_mbuf *m;
 
        m = __rte_mbuf_raw_alloc(mp);
-       __rte_mbuf_sanity_check_raw(m, RTE_MBUF_PKT, 0);
+       __rte_mbuf_sanity_check_raw(m, 0);
 
        return m;
 }
@@ -109,12 +109,12 @@ eth_xenvirt_rx(void *q, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
        for (i = 0; i < num ; i ++) {
                rxm = rx_pkts[i];
                PMD_RX_LOG(DEBUG, "packet len:%d\n", len[i]);
-               rxm->pkt.next = NULL;
-               rxm->pkt.data = (char *)rxm->buf_addr + RTE_PKTMBUF_HEADROOM;
-               rxm->pkt.data_len = (uint16_t)(len[i] - sizeof(struct virtio_net_hdr));
-               rxm->pkt.nb_segs = 1;
-               rxm->pkt.in_port = pi->port_id;
-               rxm->pkt.pkt_len  = (uint32_t)(len[i] - sizeof(struct virtio_net_hdr));
+               rxm->next = NULL;
+               rxm->data_off = RTE_PKTMBUF_HEADROOM;
+               rxm->data_len = (uint16_t)(len[i] - sizeof(struct virtio_net_hdr));
+               rxm->nb_segs = 1;
+               rxm->port = pi->port_id;
+               rxm->pkt_len  = (uint32_t)(len[i] - sizeof(struct virtio_net_hdr));
        }
        /* allocate new mbuf for the used descriptor */
        while (likely(!virtqueue_full(rxvq))) {
@@ -211,8 +211,8 @@ gntalloc_vring_flag(int vtidx)
        }
 
        *(uint8_t *)ptr = MAP_FLAG;
-       rte_snprintf(val_str, sizeof(val_str), "%u", gref_tmp);
-       rte_snprintf(key_str, sizeof(key_str),
+       snprintf(val_str, sizeof(val_str), "%u", gref_tmp);
+       snprintf(key_str, sizeof(key_str),
                DPDK_XENSTORE_PATH"%d"VRING_FLAG_STR, vtidx);
        xenstore_write(key_str, val_str);
 }
@@ -230,10 +230,10 @@ dev_start_notify(int vtidx)
        RTE_LOG(INFO, PMD, "%s: virtio %d is started\n", __func__, vtidx);
        gntalloc_vring_flag(vtidx);
 
-       rte_snprintf(key_str, sizeof(key_str), "%s%s%d",
+       snprintf(key_str, sizeof(key_str), "%s%s%d",
                DPDK_XENSTORE_PATH, EVENT_TYPE_START_STR,
                        vtidx);
-       rte_snprintf(val_str, sizeof(val_str), "1");
+       snprintf(val_str, sizeof(val_str), "1");
        xenstore_write(key_str, val_str);
 }
 
@@ -259,11 +259,11 @@ update_mac_address(struct ether_addr *mac_addrs, int vtidx)
                RTE_LOG(ERR, PMD, "%s: NULL pointer mac specified\n", __func__);
                return -1;
        }
-       rv = rte_snprintf(key_str, sizeof(key_str),
+       rv = snprintf(key_str, sizeof(key_str),
                        DPDK_XENSTORE_PATH"%d_ether_addr", vtidx);
        if (rv == -1)
                return rv;
-       rv = rte_snprintf(val_str, sizeof(val_str), "%02x:%02x:%02x:%02x:%02x:%02x",
+       rv = snprintf(val_str, sizeof(val_str), "%02x:%02x:%02x:%02x:%02x:%02x",
                        mac_addrs->addr_bytes[0],
                        mac_addrs->addr_bytes[1],
                        mac_addrs->addr_bytes[2],
@@ -419,9 +419,9 @@ gntalloc_vring_create(int queue_type, uint32_t size, int vtidx)
        }
 
        if (queue_type == VTNET_RQ)
-               rv = rte_snprintf(key_str, sizeof(key_str), DPDK_XENSTORE_PATH"%d"RXVRING_XENSTORE_STR, vtidx);
+               rv = snprintf(key_str, sizeof(key_str), DPDK_XENSTORE_PATH"%d"RXVRING_XENSTORE_STR, vtidx);
        else
-               rv = rte_snprintf(key_str, sizeof(key_str), DPDK_XENSTORE_PATH"%d"TXVRING_XENSTORE_STR, vtidx);
+               rv = snprintf(key_str, sizeof(key_str), DPDK_XENSTORE_PATH"%d"TXVRING_XENSTORE_STR, vtidx);
        if (rv == -1 || xenstore_write(key_str, val_str) == -1) {
                gntfree(va, size, start_index);
                va = NULL;
@@ -449,20 +449,20 @@ virtio_queue_setup(struct rte_eth_dev *dev, int queue_type)
 
        /* Allocate memory for virtqueue. */
        if (queue_type == VTNET_RQ) {
-               rte_snprintf(vq_name, sizeof(vq_name), "port%d_rvq",
+               snprintf(vq_name, sizeof(vq_name), "port%d_rvq",
                                dev->data->port_id);
                vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +
-                       vq_size * sizeof(struct vq_desc_extra), CACHE_LINE_SIZE);
+                       vq_size * sizeof(struct vq_desc_extra), RTE_CACHE_LINE_SIZE);
                if (vq == NULL) {
                        RTE_LOG(ERR, PMD, "%s: unabled to allocate virtqueue\n", __func__);
                        return NULL;
                }
                memcpy(vq->vq_name, vq_name, sizeof(vq->vq_name));
        } else if(queue_type == VTNET_TQ) {
-               rte_snprintf(vq_name, sizeof(vq_name), "port%d_tvq",
+               snprintf(vq_name, sizeof(vq_name), "port%d_tvq",
                        dev->data->port_id);
                vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +
-                       vq_size * sizeof(struct vq_desc_extra), CACHE_LINE_SIZE);
+                       vq_size * sizeof(struct vq_desc_extra), RTE_CACHE_LINE_SIZE);
                if (vq == NULL) {
                        RTE_LOG(ERR, PMD, "%s: unabled to allocate virtqueue\n", __func__);
                        return NULL;
@@ -556,7 +556,7 @@ rte_eth_xenvirt_parse_args(struct xenvirt_dict *dict,
        if (params == NULL)
                return 0;
 
-       args = rte_zmalloc(NULL, strlen(params) + 1, CACHE_LINE_SIZE);
+       args = rte_zmalloc(NULL, strlen(params) + 1, RTE_CACHE_LINE_SIZE);
        if (args == NULL) {
                RTE_LOG(ERR, PMD, "Couldn't parse %s device \n", name);
                return -1;
@@ -647,7 +647,7 @@ eth_dev_xenvirt_create(const char *name, const char *params,
                goto err;
 
        /* reserve an ethdev entry */
-       eth_dev = rte_eth_dev_allocate();
+       eth_dev = rte_eth_dev_allocate(name);
        if (eth_dev == NULL)
                goto err;