Commit ff612519 authored by Ziye Yang's avatar Ziye Yang Committed by Daniel Verkamp
Browse files

SPDK: Support configuring libpciaccess library 



With CONFIG_PCIACCESS=y in CONFIG file, we can
use libpciaccess library; With CONFIG_PCIACCESS=n
in CONFIG file, we use pciaccess functions provided
in DPDK.

Change-Id: I786c5589b8e7909ba2e59d222938dd5ba45bf92d
Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
parent 8374a727

CONFIG

+5 −0
Original line number Diff line number Diff line
@@ -49,3 +49,8 @@ CONFIG_NVME_IMPL?=nvme_impl.h 
# Header file to use for IOAT implementation specific functions.

# Defaults to depending on DPDK.

CONFIG_IOAT_IMPL?=ioat_impl.h



# This item indicates using libpciaccess library or not. If enabled with y,

# libpciaccess library is used to map pci devices; else DPDK library is used to

# map pci devices.

CONFIG_PCIACCESS?=y

examples/ioat/perf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \ 
	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \

	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a



LIBS += $(SPDK_LIBS) -lpciaccess -lpthread $(DPDK_LIB) -lrt

LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt



all: $(APP)

examples/ioat/verify/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \ 
	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \

	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a



LIBS += $(SPDK_LIBS) -lpciaccess -lpthread $(DPDK_LIB) -lrt

LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt



all: $(APP)

examples/nvme/identify/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \ 
	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \

	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a



LIBS += $(SPDK_LIBS) -lpciaccess -lpthread $(DPDK_LIB) -lrt

LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt



all : $(APP)

examples/nvme/perf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \ 
	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \

	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a



LIBS += $(SPDK_LIBS) -lpciaccess -lpthread $(DPDK_LIB) -lrt

LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt



ifeq ($(OS),Linux)

LIBS += -laio