From patchwork Thu Dec 3 04:25:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 9265 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id DEE2E8DB2; Thu, 3 Dec 2015 05:26:37 +0100 (CET) Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by dpdk.org (Postfix) with ESMTP id 4BE638D86 for ; Thu, 3 Dec 2015 05:26:37 +0100 (CET) Received: by wmec201 with SMTP id c201so8657699wme.0 for ; Wed, 02 Dec 2015 20:26:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=FdT9w7BRQwGDvWsEzPty9ufXkfJ/pedYS5iaTcc8bZc=; b=VgNzlGRrvD32YcshPHgBm6+iWtRxEuwfrjc0frYsfkjoSwTndLzttLRaPyhPWVUahQ wzVcnZYFnBuzIudziOtb2KiJnoZ5JS1NruMSqF9cmBES3dHO6/UyjDp1yQk258zFX7en gml0xn6gnuEWHR9Vc88u/DeC5Uwptk5YowA99IemlCZwl/jnsp4ngq7UbRMGpB5n/I0S 8WlIVCw4lWlhJozfYuc030cxS/UoGhlCJ++dIgaAXOE0LzRPc0MA/UYjoO7EGSMG6agE 5/1JXJkbfVC4dnzc9RHe+cdVDGubcxz5Re1Wo2A+/qevIULXjJPywkDaQMHptmoFtawR CQcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=FdT9w7BRQwGDvWsEzPty9ufXkfJ/pedYS5iaTcc8bZc=; b=mSzagTgnniEcWC2BMvySsYskaHBafAcx0N1jCx+OT+x9I6nB4ugylA5FxrGcshMNg3 avKne6sxqImVc6HMOtNCOQEac9xDqpQR8GnShdHnE0ve6zRyYGoBPcNePdP+hPyf5IXe UUMNRiOsaDhn+YxoYlrrOXPEdC1pJf4m4hqsdnwAYsWwUemPwiSn1+8BmDNMa4WbNQiP RQVMu204tYtwVMShQ+HV4Usi2Mn4WFmiSDcbAPRHAv1rqV839x0FmeTiz9yGJsKmIkd/ tXeYqCRNP2m99FuYf0XaGBfwF4ca0wNYZsq3PPO3Bdtg2hopez0OgZ5IYJ4I8LL3BgS3 2i6A== X-Gm-Message-State: ALoCoQlFu9j0wO9E4bwGxmJ5ki0hhLrRCWtCSolUDBumDfYCrmHfNfzOwtIu/PZulqlG7sAUw0Cz X-Received: by 10.194.88.200 with SMTP id bi8mr9831398wjb.178.1449116797113; Wed, 02 Dec 2015 20:26:37 -0800 (PST) Received: from XPS13.ibrowse.com ([93.158.46.55]) by smtp.gmail.com with ESMTPSA id wh10sm5581078wjb.45.2015.12.02.20.26.35 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 02 Dec 2015 20:26:36 -0800 (PST) From: Thomas Monjalon To: Stephen Hemminger Date: Thu, 3 Dec 2015 05:25:14 +0100 Message-Id: <1449116714-17711-1-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.5.2 Cc: dev@dpdk.org Subject: [dpdk-dev] [PATCH] eal: fix build with Xen dom0 enabled X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list 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" There is a new function in the EAL API for internal use. It has neither a proper prefix nor a .map export: libethdev.so: undefined reference to `is_xen_dom0_supported' Fixes: 719dbebceb81 ("xen: allow determining DOM0 at runtime") Signed-off-by: Thomas Monjalon --- drivers/net/i40e/i40e_rxtx.c | 2 +- lib/librte_eal/bsdapp/eal/rte_eal_version.map | 1 + lib/librte_eal/common/include/rte_memory.h | 6 +++--- lib/librte_eal/linuxapp/eal/eal_memory.c | 2 +- lib/librte_eal/linuxapp/eal/rte_eal_version.map | 1 + lib/librte_ether/rte_ethdev.c | 2 +- lib/librte_mempool/rte_mempool.c | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 13abd67..c6a18b5 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -2531,7 +2531,7 @@ i40e_memzone_reserve(const char *name, uint32_t len, int socket_id) if (mz) return mz; - if (is_xen_dom0_supported()) + if (rte_xen_dom0_supported()) mz = rte_memzone_reserve_bounded(name, len, socket_id, 0, I40E_RING_BASE_ALIGN, RTE_PGSIZE_2M); else diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map index f9d4b1c..7a88387 100644 --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map @@ -134,5 +134,6 @@ DPDK_2.2 { rte_keepalive_dispatch_pings; rte_keepalive_mark_alive; rte_keepalive_register_core; + rte_xen_dom0_supported; } DPDK_2.1; diff --git a/lib/librte_eal/common/include/rte_memory.h b/lib/librte_eal/common/include/rte_memory.h index 33f5a77..9c9e40f 100644 --- a/lib/librte_eal/common/include/rte_memory.h +++ b/lib/librte_eal/common/include/rte_memory.h @@ -184,7 +184,7 @@ unsigned rte_memory_get_nrank(void); #ifdef RTE_LIBRTE_XEN_DOM0 /**< Internal use only - should DOM0 memory mapping be used */ -extern int is_xen_dom0_supported(void); +extern int rte_xen_dom0_supported(void); /**< Internal use only - phys to virt mapping for xen */ phys_addr_t rte_xen_mem_phy2mch(uint32_t, const phys_addr_t); @@ -203,7 +203,7 @@ phys_addr_t rte_xen_mem_phy2mch(uint32_t, const phys_addr_t); static inline phys_addr_t rte_mem_phy2mch(uint32_t memseg_id, const phys_addr_t phy_addr) { - if (is_xen_dom0_supported()) + if (rte_xen_dom0_supported()) return rte_xen_mem_phy2mch(memseg_id, phy_addr); else return phy_addr; @@ -231,7 +231,7 @@ int rte_xen_dom0_memory_init(void); */ int rte_xen_dom0_memory_attach(void); #else -static inline int is_xen_dom0_supported(void) +static inline int rte_xen_dom0_supported(void) { return 0; } diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c index 0de75cd..846fd31 100644 --- a/lib/librte_eal/linuxapp/eal/eal_memory.c +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c @@ -98,7 +98,7 @@ #include "eal_hugepages.h" #ifdef RTE_LIBRTE_XEN_DOM0 -int is_xen_dom0_supported(void) +int rte_xen_dom0_supported(void) { return internal_config.xen_dom0_support; } diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map index 54d496e..828496f 100644 --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map @@ -137,5 +137,6 @@ DPDK_2.2 { rte_keepalive_dispatch_pings; rte_keepalive_mark_alive; rte_keepalive_register_core; + rte_xen_dom0_supported; } DPDK_2.1; diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 3840775..c3eed49 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -2605,7 +2605,7 @@ rte_eth_dma_zone_reserve(const struct rte_eth_dev *dev, const char *ring_name, if (mz) return mz; - if (is_xen_dom0_supported()) + if (rte_xen_dom0_supported()) return rte_memzone_reserve_bounded(z_name, size, socket_id, 0, align, RTE_PGSIZE_2M); else diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c index f53076a..aff5f6d 100644 --- a/lib/librte_mempool/rte_mempool.c +++ b/lib/librte_mempool/rte_mempool.c @@ -403,7 +403,7 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size, rte_mempool_obj_ctor_t *obj_init, void *obj_init_arg, int socket_id, unsigned flags) { - if (is_xen_dom0_supported()) + if (rte_xen_dom0_supported()) return rte_dom0_mempool_create(name, n, elt_size, cache_size, private_data_size, mp_init, mp_init_arg,