From 535827c55918775af955557a578f2366e4f06a11 Mon Sep 17 00:00:00 2001
From: Ben Walker <benjamin.walker@intel.com>
Date: Mon, 3 Oct 2016 14:26:07 -0700
Subject: [PATCH] env: Eliminate remaining usage of rte_memzone

This was only used for debugging. Everywhere else
used the spdk_memzone abstraction.

Change-Id: I8a828ea3c7abccb66c8a027cb13de43c560ff7a1
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
---
 app/iscsi_tgt/iscsi_tgt.c     | 4 ++--
 app/nvmf_tgt/nvmf_tgt.c       | 3 +--
 include/spdk/env.h            | 7 +++++++
 lib/env/env.c                 | 6 ++++++
 lib/iscsi/iscsi.c             | 1 -
 lib/iscsi/iscsi_subsystem.c   | 1 -
 test/lib/nvme/unit/test_env.c | 6 ++++++
 7 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/iscsi_tgt/iscsi_tgt.c b/app/iscsi_tgt/iscsi_tgt.c
index f78e97e22..6d6723fb7 100644
--- a/app/iscsi_tgt/iscsi_tgt.c
+++ b/app/iscsi_tgt/iscsi_tgt.c
@@ -36,10 +36,10 @@
 #include <stdlib.h>
 
 #include <rte_config.h>
-#include <rte_memzone.h>
 #include <rte_eal.h>
 #include <rte_lcore.h>
 
+#include "spdk/env.h"
 #include "spdk/event.h"
 #include "iscsi/iscsi.h"
 #include "spdk/log.h"
@@ -85,7 +85,7 @@ static void
 spdk_startup(spdk_event_t event)
 {
 	if (getenv("MEMZONE_DUMP") != NULL) {
-		rte_memzone_dump(stdout);
+		spdk_memzone_dump(stdout);
 		fflush(stdout);
 	}
 }
diff --git a/app/nvmf_tgt/nvmf_tgt.c b/app/nvmf_tgt/nvmf_tgt.c
index 10ad32279..1b2369c05 100644
--- a/app/nvmf_tgt/nvmf_tgt.c
+++ b/app/nvmf_tgt/nvmf_tgt.c
@@ -39,7 +39,6 @@
 #include <signal.h>
 
 #include <rte_config.h>
-#include <rte_memzone.h>
 #include <rte_lcore.h>
 
 #include "nvmf_tgt.h"
@@ -337,7 +336,7 @@ spdk_nvmf_startup(spdk_event_t event)
 	SPDK_NOTICELOG("Acceptor running on core %u\n", g_spdk_nvmf_tgt_conf.acceptor_lcore);
 
 	if (getenv("MEMZONE_DUMP") != NULL) {
-		rte_memzone_dump(stdout);
+		spdk_memzone_dump(stdout);
 		fflush(stdout);
 	}
 
diff --git a/include/spdk/env.h b/include/spdk/env.h
index ce7c85dd5..71f2a453f 100644
--- a/include/spdk/env.h
+++ b/include/spdk/env.h
@@ -45,6 +45,7 @@ extern "C" {
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <stdio.h>
 
 struct spdk_pci_device;
 
@@ -85,6 +86,12 @@ spdk_memzone_lookup(const char *name);
 int
 spdk_memzone_free(const char *name);
 
+/**
+ * Dump debug information about all memzones.
+ */
+void
+spdk_memzone_dump(FILE *f);
+
 struct spdk_mempool;
 
 /**
diff --git a/lib/env/env.c b/lib/env/env.c
index 5a41c9234..6772fc958 100644
--- a/lib/env/env.c
+++ b/lib/env/env.c
@@ -97,6 +97,12 @@ spdk_memzone_free(const char *name)
 	return -1;
 }
 
+void
+spdk_memzone_dump(FILE *f)
+{
+	rte_memzone_dump(f);
+}
+
 struct spdk_mempool *
 spdk_mempool_create(const char *name, size_t count,
 		    size_t ele_size, size_t cache_size)
diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c
index 7835365ba..bb4f27be5 100644
--- a/lib/iscsi/iscsi.c
+++ b/lib/iscsi/iscsi.c
@@ -54,7 +54,6 @@
 #include <rte_common.h>
 #include <rte_log.h>
 #include <rte_memcpy.h>
-#include <rte_memzone.h>
 #include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c
index 4933c785e..1624cf911 100644
--- a/lib/iscsi/iscsi_subsystem.c
+++ b/lib/iscsi/iscsi_subsystem.c
@@ -36,7 +36,6 @@
 #include <rte_common.h>
 #include <rte_log.h>
 #include <rte_memcpy.h>
-#include <rte_memzone.h>
 #include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
diff --git a/test/lib/nvme/unit/test_env.c b/test/lib/nvme/unit/test_env.c
index 3a10c71fd..ed2f3da91 100644
--- a/test/lib/nvme/unit/test_env.c
+++ b/test/lib/nvme/unit/test_env.c
@@ -76,6 +76,12 @@ spdk_memzone_lookup(const char *name)
 	return NULL;
 }
 
+void
+spdk_memzone_dump(FILE *f)
+{
+	return;
+}
+
 int
 spdk_memzone_free(const char *name)
 {