From 12ab1e26df6368cd38c38d5b19d4f45fa2a58747 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 22 Aug 2017 16:17:41 -0700 Subject: [PATCH] nvmf: report SPDK version as firmware version Use the version #defines from spdk/version.h to build a firmware version string for the virtual NVMe-oF controller model. Change-Id: I18285cfa75c8915a7db46d4d79c0447392bd5d8c Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/375252 Reviewed-by: Ben Walker Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris --- lib/nvmf/ctrlr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c index 8ca901800..e9f640b1b 100644 --- a/lib/nvmf/ctrlr.c +++ b/lib/nvmf/ctrlr.c @@ -43,13 +43,19 @@ #include "spdk/nvme_spec.h" #include "spdk/string.h" #include "spdk/util.h" +#include "spdk/version.h" #include "spdk_internal/log.h" #define MIN_KEEP_ALIVE_TIMEOUT 10000 #define MODEL_NUMBER "SPDK bdev Controller" -#define FW_VERSION "FFFFFFFF" + +/* + * Report the SPDK version as the firmware revision. + * SPDK_VERSION_STRING won't fit into FR (only 8 bytes), so try to fit the most important parts. + */ +#define FW_VERSION SPDK_VERSION_MAJOR_STRING SPDK_VERSION_MINOR_STRING SPDK_VERSION_PATCH_STRING static uint16_t spdk_nvmf_ctrlr_gen_cntlid(void);