Commit 6bd65015 authored Nov 09, 2016 by Daniel Verkamp

env: rename default implementation to env_dpdk



Change-Id: I6aa48861917547e7081951b6d953693e109b02e6
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>

parent 8eebe5e1

CONFIG

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ CONFIG_ADDRESS_SANITIZER?=n

		# Directory that contains the desired SPDK environment library.
		# By default, this is implemented using DPDK.
		CONFIG_ENV?=$(SPDK_ROOT_DIR)/lib/env
		CONFIG_ENV?=$(SPDK_ROOT_DIR)/lib/env_dpdk

		# This directory should contain 'include' and 'lib' directories for your DPDK
		# installation. Alternatively you can specify this on the command line

PORTING.md

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ defined in [include/spdk/env.h](include/spdk/env.h).

		SPDK includes a default implementation of the env library based
		on the Data Plane Development Kit ([DPDK](http://dpdk.org/)).
		This DPDK implementation can be found in `lib/env`.
		This DPDK implementation can be found in `lib/env_dpdk`.

		DPDK is currently supported on Linux and FreeBSD only.
		Users who want to use SPDK on other operating systems, or in
		@@ -19,4 +19,4 @@ a new version of the env library. The new implementation can be
		integrated into the SPDK build by updating the following line
		in CONFIG:

		CONFIG_ENV?=$(SPDK_ROOT_DIR)/lib/env
		CONFIG_ENV?=$(SPDK_ROOT_DIR)/lib/env_dpdk

lib/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..)
		include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

		DIRS-y += bdev conf copy cunit event json jsonrpc \
		log env net rpc trace util nvme nvmf scsi ioat
		log env_dpdk net rpc trace util nvme nvmf scsi ioat
		ifeq ($(OS),Linux)
		DIRS-y += iscsi
		endif

lib/env/Makefile→lib/env_dpdk/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

		CFLAGS += $(DPDK_INC)
		C_SRCS = env.c pci.c vtophys.c
		LIBNAME = env
		LIBNAME = env_dpdk

		include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

lib/env/env.c→lib/env_dpdk/env.c

+0 −0

File moved.