From 2ccb76c30a86c77781de157e2f60d1b2242119c3 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Tue, 29 Jun 2021 23:19:25 +0800 Subject: [PATCH] nvmf/vfio-user: remove unnecessary macros These macros are only valid for Fabric transports. Change-Id: Ia456eebdcdab28e81226c1b3a7211fcb41b5e481 Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8554 Community-CI: Mellanox Build Bot Reviewed-by: John Levon Reviewed-by: Jim Harris Reviewed-by: Ben Walker Tested-by: SPDK CI Jenkins --- lib/nvmf/vfio_user.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/nvmf/vfio_user.c b/lib/nvmf/vfio_user.c index ef2513044..5678adcee 100644 --- a/lib/nvmf/vfio_user.c +++ b/lib/nvmf/vfio_user.c @@ -54,11 +54,8 @@ #define NVMF_VFIO_USER_DEFAULT_MAX_QUEUE_DEPTH 256 #define NVMF_VFIO_USER_DEFAULT_AQ_DEPTH 32 #define NVMF_VFIO_USER_DEFAULT_MAX_QPAIRS_PER_CTRLR 64 -#define NVMF_VFIO_USER_DEFAULT_IN_CAPSULE_DATA_SIZE 0 #define NVMF_VFIO_USER_DEFAULT_MAX_IO_SIZE ((NVMF_REQ_MAX_BUFFERS - 1) << SHIFT_4KB) #define NVMF_VFIO_USER_DEFAULT_IO_UNIT_SIZE NVMF_VFIO_USER_DEFAULT_MAX_IO_SIZE -#define NVMF_VFIO_USER_DEFAULT_NUM_SHARED_BUFFERS 0 /* internal buf size */ -#define NVMF_VFIO_USER_DEFAULT_BUFFER_CACHE_SIZE 0 #define NVMF_VFIO_USER_DOORBELLS_OFFSET 0x1000 #define NVMF_VFIO_USER_DOORBELLS_SIZE 0x1000 @@ -2495,12 +2492,12 @@ nvmf_vfio_user_opts_init(struct spdk_nvmf_transport_opts *opts) { opts->max_queue_depth = NVMF_VFIO_USER_DEFAULT_MAX_QUEUE_DEPTH; opts->max_qpairs_per_ctrlr = NVMF_VFIO_USER_DEFAULT_MAX_QPAIRS_PER_CTRLR; - opts->in_capsule_data_size = NVMF_VFIO_USER_DEFAULT_IN_CAPSULE_DATA_SIZE; + opts->in_capsule_data_size = 0; opts->max_io_size = NVMF_VFIO_USER_DEFAULT_MAX_IO_SIZE; opts->io_unit_size = NVMF_VFIO_USER_DEFAULT_IO_UNIT_SIZE; opts->max_aq_depth = NVMF_VFIO_USER_DEFAULT_AQ_DEPTH; - opts->num_shared_buffers = NVMF_VFIO_USER_DEFAULT_NUM_SHARED_BUFFERS; - opts->buf_cache_size = NVMF_VFIO_USER_DEFAULT_BUFFER_CACHE_SIZE; + opts->num_shared_buffers = 0; + opts->buf_cache_size = 0; opts->transport_specific = NULL; }