From d7635243b9d7748a0a254b99a2c9564e66b4a52e Mon Sep 17 00:00:00 2001 From: Cunyin Chang Date: Fri, 14 Oct 2016 02:05:58 +0800 Subject: [PATCH] bdev/nvme: replace the structure nvme_bdf_whitelist with spdk_pci_addr. Change-Id: I6a4e4304f166fb744164ee5eb113a9185b2425b2 Signed-off-by: Cunyin Chang --- lib/bdev/nvme/blockdev_nvme.c | 1 - lib/bdev/nvme/blockdev_nvme.h | 10 ++-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/bdev/nvme/blockdev_nvme.c b/lib/bdev/nvme/blockdev_nvme.c index 39918bc24..467006f83 100644 --- a/lib/bdev/nvme/blockdev_nvme.c +++ b/lib/bdev/nvme/blockdev_nvme.c @@ -44,7 +44,6 @@ #include "spdk/conf.h" #include "spdk/endian.h" -#include "spdk/env.h" #include "spdk/log.h" #include "spdk/bdev.h" #include "spdk/nvme.h" diff --git a/lib/bdev/nvme/blockdev_nvme.h b/lib/bdev/nvme/blockdev_nvme.h index fd0a7e7a2..8f7a1e56e 100644 --- a/lib/bdev/nvme/blockdev_nvme.h +++ b/lib/bdev/nvme/blockdev_nvme.h @@ -35,20 +35,14 @@ #define SPDK_BLOCKDEV_NVME_H #include +#include "spdk/env.h" #define NVME_MAX_CONTROLLERS 16 -struct nvme_bdf_whitelist { - uint16_t domain; - uint8_t bus; - uint8_t dev; - uint8_t func; -}; - struct nvme_probe_ctx { int controllers_remaining; int num_whitelist_controllers; - struct nvme_bdf_whitelist whitelist[NVME_MAX_CONTROLLERS]; + struct spdk_pci_addr whitelist[NVME_MAX_CONTROLLERS]; }; int