On Fri, Apr 18, 2014 at 02:58:08PM +0200, David Marchand wrote:
> There is no need for a 'magic' field in struct rte_config, as this part of the
> structure is local to each process. All threads of a process are synchronised
> because of the run_once atomic.
> So remove this field, as it is only adding confusion when reading code that
> references 'magic' field from struct rte_mem_config.
>
> Besides, there is no reference about the 'version' field, so remove it as
> well.
>
> Signed-off-by: David Marchand <david.marchand at 6wind.com>
Acked-by: Neil Horman <nhorman at tuxdriver.com>
> ---
> lib/librte_eal/bsdapp/eal/eal.c | 2 --
> lib/librte_eal/common/include/rte_eal.h | 4 ----
> lib/librte_eal/linuxapp/eal/eal.c | 2 --
> 3 files changed, 8 deletions(-)
>
> diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
> index e944aba..8c81613 100644
> --- a/lib/librte_eal/bsdapp/eal/eal.c
> +++ b/lib/librte_eal/bsdapp/eal/eal.c
> @@ -277,8 +277,6 @@ eal_proc_type_detect(void)
> static void
> rte_config_init(void)
> {
> - /* set the magic in configuration structure */
> - rte_config.magic = RTE_MAGIC;
> rte_config.process_type = (internal_config.process_type ==
> RTE_PROC_AUTO) ?
> eal_proc_type_detect() : /* for auto, detect the type */
> internal_config.process_type; /* otherwise use what's
> already set */
> diff --git a/lib/librte_eal/common/include/rte_eal.h
> b/lib/librte_eal/common/include/rte_eal.h
> index 658b4f7..8fac05e 100644
> --- a/lib/librte_eal/common/include/rte_eal.h
> +++ b/lib/librte_eal/common/include/rte_eal.h
> @@ -71,10 +71,6 @@ enum rte_proc_type_t {
> * The global RTE configuration structure.
> */
> struct rte_config {
> - uint32_t version; /**< Configuration [structure] version. */
> - uint32_t magic; /**< Magic number - Sanity check. */
> -
> -
> uint32_t master_lcore; /**< Id of the master lcore */
> uint32_t lcore_count; /**< Number of available logical cores. */
> enum rte_lcore_role_t lcore_role[RTE_MAX_LCORE]; /**< State of cores. */
> diff --git a/lib/librte_eal/linuxapp/eal/eal.c
> b/lib/librte_eal/linuxapp/eal/eal.c
> index 04b2b32..b7f5ffa 100644
> --- a/lib/librte_eal/linuxapp/eal/eal.c
> +++ b/lib/librte_eal/linuxapp/eal/eal.c
> @@ -289,8 +289,6 @@ eal_proc_type_detect(void)
> static void
> rte_config_init(void)
> {
> - /* set the magic in configuration structure */
> - rte_config.magic = RTE_MAGIC;
> rte_config.process_type = (internal_config.process_type ==
> RTE_PROC_AUTO) ?
> eal_proc_type_detect() : /* for auto, detect the type */
> internal_config.process_type; /* otherwise use what's
> already set */
> --
> 1.7.10.4
>
>
