From 5fdb4ada1c97ce9399dfb0a8d4d14fbbf1bf1dc8 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Mon, 13 Jun 2016 13:24:29 +0200 Subject: [PATCH] net/xenvirt: fix build after mempool changes The field elt_va_start has been removed from the mempool structure, and it was not replaced in xenvirt. Fix this by getting the mempool objects address by using the address of the first memory chunk list. Note that it won't work with mempool composed of several chunks, but it was already the case before. Fixes: 84121f197187 ("mempool: store memory chunks in a list") Reported-by: Christian Ehrhardt Signed-off-by: Olivier Matz Acked-by: Christian Ehrhardt --- drivers/net/xenvirt/rte_xen_lib.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/xenvirt/rte_xen_lib.c b/drivers/net/xenvirt/rte_xen_lib.c index de63cd30b8..6c9a1d49ed 100644 --- a/drivers/net/xenvirt/rte_xen_lib.c +++ b/drivers/net/xenvirt/rte_xen_lib.c @@ -423,6 +423,7 @@ grant_gntalloc_mbuf_pool(struct rte_mempool *mpool, uint32_t pg_num, uint32_t *g { char key_str[PATH_MAX] = {0}; char val_str[PATH_MAX] = {0}; + void *mempool_obj_va; if (grant_node_create(pg_num, gref_arr, pa_arr, val_str, sizeof(val_str))) { return -1; @@ -437,7 +438,14 @@ grant_gntalloc_mbuf_pool(struct rte_mempool *mpool, uint32_t pg_num, uint32_t *g if (snprintf(key_str, sizeof(key_str), DPDK_XENSTORE_PATH"%d"MEMPOOL_VA_XENSTORE_STR, mempool_idx) == -1) return -1; - if (snprintf(val_str, sizeof(val_str), "%"PRIxPTR, (uintptr_t)mpool->elt_va_start) == -1) + if (mpool->nb_mem_chunks != 1) { + RTE_LOG(ERR, PMD, + "mempool with more than 1 chunk is not supported\n"); + return -1; + } + mempool_obj_va = STAILQ_FIRST(&mpool->mem_list)->addr; + if (snprintf(val_str, sizeof(val_str), "%"PRIxPTR, + (uintptr_t)mempool_obj_va) == -1) return -1; if (xenstore_write(key_str, val_str) == -1) return -1; -- 2.20.1