[dpdk-dev] ivshmem: fix for modified mempool struct

Message ID 1467390408-781-1-git-send-email-ferruh.yigit@intel.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Ferruh Yigit July 1, 2016, 4:26 p.m. UTC
  struct rte_mempool changed its "ring" field to "pool_data"

"ring" field is accessed by ivshmem library, and updated to "pool_data"

This patch fixes the compile error:

== Build lib/librte_ivshmem
  CC rte_ivshmem.o
.../lib/librte_ivshmem/rte_ivshmem.c:
 In function 'add_mempool_to_metadata':
.../lib/librte_ivshmem/rte_ivshmem.c:584:32:
 error: 'const struct rte_mempool' has no member named 'ring'
  return add_ring_to_metadata(mp->ring, config);
                                ^~

Fixes: 449c49b93a6b ("mempool: support handler operations")
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 lib/librte_ivshmem/rte_ivshmem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Hunt, David July 1, 2016, 4:37 p.m. UTC | #1
On 1/7/2016 5:26 PM, Ferruh Yigit wrote:
> struct rte_mempool changed its "ring" field to "pool_data"
>
> "ring" field is accessed by ivshmem library, and updated to "pool_data"
>
> This patch fixes the compile error:
>
> == Build lib/librte_ivshmem
>    CC rte_ivshmem.o
> .../lib/librte_ivshmem/rte_ivshmem.c:
>   In function 'add_mempool_to_metadata':
> .../lib/librte_ivshmem/rte_ivshmem.c:584:32:
>   error: 'const struct rte_mempool' has no member named 'ring'
>    return add_ring_to_metadata(mp->ring, config);
>                                  ^~
>
> Fixes: 449c49b93a6b ("mempool: support handler operations")
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
> ---
>   lib/librte_ivshmem/rte_ivshmem.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/librte_ivshmem/rte_ivshmem.c b/lib/librte_ivshmem/rte_ivshmem.c
> index 5c83920..c26edb6 100644
> --- a/lib/librte_ivshmem/rte_ivshmem.c
> +++ b/lib/librte_ivshmem/rte_ivshmem.c
> @@ -581,7 +581,7 @@ add_mempool_to_metadata(const struct rte_mempool *mp,
>   	}
>   
>   	/* mempool consists of memzone and ring */
> -	return add_ring_to_metadata(mp->ring, config);
> +	return add_ring_to_metadata(mp->pool_data, config);
>   }
>   
>   int

Acked-by: David Hunt <david.hunt@intel.com>
  
Thomas Monjalon July 1, 2016, 5:32 p.m. UTC | #2
2016-07-01 17:26, Ferruh Yigit:
> struct rte_mempool changed its "ring" field to "pool_data"
> 
> "ring" field is accessed by ivshmem library, and updated to "pool_data"
> 
> This patch fixes the compile error:
> 
> == Build lib/librte_ivshmem
>   CC rte_ivshmem.o
> .../lib/librte_ivshmem/rte_ivshmem.c:
>  In function 'add_mempool_to_metadata':
> .../lib/librte_ivshmem/rte_ivshmem.c:584:32:
>  error: 'const struct rte_mempool' has no member named 'ring'
>   return add_ring_to_metadata(mp->ring, config);
>                                 ^~
> 
> Fixes: 449c49b93a6b ("mempool: support handler operations")
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>

Applied, thanks
  

Patch

diff --git a/lib/librte_ivshmem/rte_ivshmem.c b/lib/librte_ivshmem/rte_ivshmem.c
index 5c83920..c26edb6 100644
--- a/lib/librte_ivshmem/rte_ivshmem.c
+++ b/lib/librte_ivshmem/rte_ivshmem.c
@@ -581,7 +581,7 @@  add_mempool_to_metadata(const struct rte_mempool *mp,
 	}
 
 	/* mempool consists of memzone and ring */
-	return add_ring_to_metadata(mp->ring, config);
+	return add_ring_to_metadata(mp->pool_data, config);
 }
 
 int