From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergio Gonzalez Monroy Subject: [PATCH v6 5/9] eal: remove free_memseg and references to it Date: Fri, 26 Jun 2015 16:29:34 +0100 Message-ID: <1435332578-28415-6-git-send-email-sergio.gonzalez.monroy@intel.com> References: <1433586732-28217-1-git-send-email-sergio.gonzalez.monroy@intel.com> <1435332578-28415-1-git-send-email-sergio.gonzalez.monroy@intel.com> To: dev@dpdk.org Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 3F203C970 for ; Fri, 26 Jun 2015 17:29:44 +0200 (CEST) Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t5QFTdMa011013 for ; Fri, 26 Jun 2015 16:29:39 +0100 Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id t5QFTd91028489 for ; Fri, 26 Jun 2015 16:29:39 +0100 Received: (from smonroy@localhost) by sivswdev02.ir.intel.com with id t5QFTd4t028485 for dev@dpdk.org; Fri, 26 Jun 2015 16:29:39 +0100 In-Reply-To: <1435332578-28415-1-git-send-email-sergio.gonzalez.monroy@intel.com> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Remove free_memseg field from internal mem config structure as it is not used anymore. Also remove code in ivshmem that was setting up free_memseg on init. Signed-off-by: Sergio Gonzalez Monroy --- lib/librte_eal/common/include/rte_eal_memconfig.h | 3 --- lib/librte_eal/linuxapp/eal/eal_ivshmem.c | 9 --------- 2 files changed, 12 deletions(-) diff --git a/lib/librte_eal/common/include/rte_eal_memconfig.h b/lib/librte_eal/common/include/rte_eal_memconfig.h index 055212a..7de906b 100644 --- a/lib/librte_eal/common/include/rte_eal_memconfig.h +++ b/lib/librte_eal/common/include/rte_eal_memconfig.h @@ -73,9 +73,6 @@ struct rte_mem_config { struct rte_memseg memseg[RTE_MAX_MEMSEG]; /**< Physmem descriptors. */ struct rte_memzone memzone[RTE_MAX_MEMZONE]; /**< Memzone descriptors. */ - /* Runtime Physmem descriptors - NOT USED */ - struct rte_memseg free_memseg[RTE_MAX_MEMSEG]; - struct rte_tailq_head tailq_head[RTE_MAX_TAILQ]; /**< Tailqs for objects */ /* Heaps of Malloc per socket */ diff --git a/lib/librte_eal/linuxapp/eal/eal_ivshmem.c b/lib/librte_eal/linuxapp/eal/eal_ivshmem.c index 2deaeb7..facfb80 100644 --- a/lib/librte_eal/linuxapp/eal/eal_ivshmem.c +++ b/lib/librte_eal/linuxapp/eal/eal_ivshmem.c @@ -725,15 +725,6 @@ map_all_segments(void) * expect memsegs to be empty */ memcpy(&mcfg->memseg[i], &ms, sizeof(struct rte_memseg)); - memcpy(&mcfg->free_memseg[i], &ms, - sizeof(struct rte_memseg)); - - - /* adjust the free_memseg so that there's no free space left */ - mcfg->free_memseg[i].ioremap_addr += mcfg->free_memseg[i].len; - mcfg->free_memseg[i].phys_addr += mcfg->free_memseg[i].len; - mcfg->free_memseg[i].addr_64 += mcfg->free_memseg[i].len; - mcfg->free_memseg[i].len = 0; close(fd); -- 1.9.3