From 5613e6f3d32469379b23759d1470ef1f960fb0cb Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Fri, 2 Jun 2017 10:53:01 -0700 Subject: [PATCH] nvmf_tgt: Remove use of rte_lcore Change-Id: I272c2e56984abbb820758866297ee9e916af625a Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/363605 Reviewed-by: John Meneghini Tested-by: SPDK Automated Test System Reviewed-by: Reviewed-by: Daniel Verkamp --- app/nvmf_tgt/conf.c | 7 ++----- app/nvmf_tgt/nvmf_tgt.c | 5 +---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/nvmf_tgt/conf.c b/app/nvmf_tgt/conf.c index 5dcbcd213..cb263fe0d 100644 --- a/app/nvmf_tgt/conf.c +++ b/app/nvmf_tgt/conf.c @@ -33,9 +33,6 @@ #include "spdk/stdinc.h" -#include -#include - #include "nvmf_tgt.h" #include "spdk/conf.h" @@ -137,7 +134,7 @@ spdk_add_nvmf_discovery_subsystem(void) app_subsys = nvmf_tgt_create_subsystem(SPDK_NVMF_DISCOVERY_NQN, SPDK_NVMF_SUBTYPE_DISCOVERY, NVMF_SUBSYSTEM_MODE_DIRECT, - rte_get_master_lcore()); + g_spdk_nvmf_tgt_conf.acceptor_lcore); if (app_subsys == NULL) { SPDK_ERRLOG("Failed creating discovery nvmf library subsystem\n"); return -1; @@ -202,7 +199,7 @@ spdk_nvmf_parse_nvmf_tgt(void) acceptor_lcore = spdk_conf_section_get_intval(sp, "AcceptorCore"); if (acceptor_lcore < 0) { - acceptor_lcore = rte_lcore_id(); + acceptor_lcore = spdk_env_get_current_core(); } g_spdk_nvmf_tgt_conf.acceptor_lcore = acceptor_lcore; diff --git a/app/nvmf_tgt/nvmf_tgt.c b/app/nvmf_tgt/nvmf_tgt.c index 798a99b78..9778cba4d 100644 --- a/app/nvmf_tgt/nvmf_tgt.c +++ b/app/nvmf_tgt/nvmf_tgt.c @@ -33,9 +33,6 @@ #include "spdk/stdinc.h" -#include -#include - #include "nvmf_tgt.h" #include "spdk/bdev.h" @@ -312,7 +309,7 @@ spdk_nvmf_tgt_start(struct spdk_app_opts *opts) opts->shutdown_cb = spdk_nvmf_shutdown_cb; spdk_app_init(opts); - printf("Total cores available: %d\n", rte_lcore_count()); + printf("Total cores available: %d\n", spdk_env_get_core_count()); /* Blocks until the application is exiting */ rc = spdk_app_start(spdk_nvmf_startup, NULL, NULL);