Add capability for unique plugin version

[dwagner: ported from nvme-cli-monolithic]
Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/cmd_handler.h b/cmd_handler.h
index d40740d7bb16cc327266ae8669147345e95a96c0..73b5962e51c4da7bd8000248433af72a56c43c61 100644 (file)
--- a/cmd_handler.h
+++ b/cmd_handler.h
@@ -5,7 +5,7 @@
  */
 
 #undef NAME
-#define NAME(n, d)
+#define NAME(n, d, v)
 
 #undef ENTRY
 #define ENTRY(n, h, f, ...) \
@@ -26,7 +26,7 @@ static int f(int argc, char **argv, struct command *command, struct plugin *plug
  */
 
 #undef NAME
-#define NAME(n, d)
+#define NAME(n, d, v)
 
 #undef ENTRY_W_ALIAS
 #define ENTRY_W_ALIAS(n, h, f, a)      \
@@ -63,7 +63,7 @@ static struct command f ## _cmd = {   \
  */
 
 #undef NAME
-#define NAME(n, d)
+#define NAME(n, d, v)
 
 #undef ENTRY
 #define ENTRY(n, h, f, ...) &f ## _cmd,
@@ -87,7 +87,7 @@ static struct command *commands[] = { \
  */
 
 #undef NAME
-#define NAME(n, d) .name = n, .desc = d,
+#define NAME(n, d, v) .name = n, .desc = d, .version = v,
 
 #undef COMMAND_LIST
 #define COMMAND_LIST(args...)

diff --git a/plugin.c b/plugin.c
index 5e89a39a201657bfe9fbec33c7ae378aaba2c37b..fd8f67dd58680edca4c7d6d86e0d62d53d72fc63 100644 (file)
--- a/plugin.c
+++ b/plugin.c
@@ -11,7 +11,7 @@ static int version(struct plugin *plugin)
        struct program *prog = plugin->parent;
 
        if (plugin->name)
-               printf("%s %s version %s\n", prog->name, plugin->name, prog->version);
+               printf("%s %s version %s\n", prog->name, plugin->name, plugin->version);
        else
                printf("%s version %s\n", prog->name, prog->version);
        return 0;

diff --git a/plugin.h b/plugin.h
index 91079fbecc8a68be05f3bf6db78e23568a5717a9..7a8ed090f7fa9584691474426ae6d655e0517e8a 100644 (file)
--- a/plugin.h
+++ b/plugin.h
@@ -16,6 +16,7 @@ struct program {
 struct plugin {
        const char *name;
        const char *desc;
+       const char *version;
        struct command **commands;
        struct program *parent;
        struct plugin *next;

diff --git a/plugins/amzn/amzn-nvme.h b/plugins/amzn/amzn-nvme.h
index 9b8d797c48d9c539892ee672272368788f0f9fbb..f969c0ecadb0ae4513704e13c34229ab6f1ee854 100644 (file)
--- a/plugins/amzn/amzn-nvme.h
+++ b/plugins/amzn/amzn-nvme.h
@@ -6,7 +6,7 @@
 
 #include "cmd.h"
 
-PLUGIN(NAME("amzn", "Amazon vendor specific extensions"),
+PLUGIN(NAME("amzn", "Amazon vendor specific extensions", NVME_VERSION),
        COMMAND_LIST(
                ENTRY("id-ctrl", "Send NVMe Identify Controller", id_ctrl)
        )

diff --git a/plugins/dera/dera-nvme.h b/plugins/dera/dera-nvme.h
index dc54fabcb1eb04b7bcaa220ee6f1dce72160cdc6..d3a8b0b5e22dc7b6c28ecdcd0936a62f89cc21b7 100644 (file)
--- a/plugins/dera/dera-nvme.h
+++ b/plugins/dera/dera-nvme.h
@@ -6,7 +6,7 @@
 
 #include "cmd.h"
 
-PLUGIN(NAME("dera", "Dera vendor specific extensions"),
+PLUGIN(NAME("dera", "Dera vendor specific extensions", NVME_VERSION),
        COMMAND_LIST(
                ENTRY("smart-log-add", "Retrieve Dera SMART Log, show it", get_status, "stat")
        )

diff --git a/plugins/huawei/huawei-nvme.h b/plugins/huawei/huawei-nvme.h
index 7aac90cb76e9806e1459d5c3083b10cadc302eb4..175ddd5b9bb91f95da22df14d8b62b8bae8a4640 100644 (file)
--- a/plugins/huawei/huawei-nvme.h
+++ b/plugins/huawei/huawei-nvme.h
@@ -6,7 +6,7 @@
 
 #include "cmd.h"
 
-PLUGIN(NAME("huawei", "Huawei vendor specific extensions"),
+PLUGIN(NAME("huawei", "Huawei vendor specific extensions", NVME_VERSION),
        COMMAND_LIST(
                ENTRY("list", "List all Huawei NVMe devices and namespaces on machine", huawei_list)
                ENTRY("id-ctrl", "Huawei identify controller", huawei_id_ctrl)

diff --git a/plugins/intel/intel-nvme.h b/plugins/intel/intel-nvme.h
index b1190042330613ba95b4185b586016c92cce58a5..af1231a943229e60481e591d34249e1b72231e3f 100644 (file)
--- a/plugins/intel/intel-nvme.h
+++ b/plugins/intel/intel-nvme.h
@@ -6,7 +6,7 @@
 
 #include "cmd.h"
 
-PLUGIN(NAME("intel", "Intel vendor specific extensions"),
+PLUGIN(NAME("intel", "Intel vendor specific extensions", NVME_VERSION),
        COMMAND_LIST(
                ENTRY("id-ctrl", "Send NVMe Identify Controller", id_ctrl)
                ENTRY("internal-log", "Retrieve Intel internal firmware log, save it", get_internal_log)

diff --git a/plugins/memblaze/memblaze-nvme.h b/plugins/memblaze/memblaze-nvme.h
index 043d0a8d0cc972a0e497d71ff4fba20deb0cd8c6..6f10bd7aed1a15904457205cad3283302361bc17 100644 (file)
--- a/plugins/memblaze/memblaze-nvme.h
+++ b/plugins/memblaze/memblaze-nvme.h
@@ -12,7 +12,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-PLUGIN(NAME("memblaze", "Memblaze vendor specific extensions"),
+PLUGIN(NAME("memblaze", "Memblaze vendor specific extensions", NVME_VERSION),
        COMMAND_LIST(
                ENTRY("smart-log-add", "Retrieve Memblaze SMART Log, show it", mb_get_additional_smart_log)
                ENTRY("get-pm-status", "Get Memblaze Power Manager Status", mb_get_powermanager_status)

diff --git a/plugins/micron/micron-nvme.h b/plugins/micron/micron-nvme.h
index 50e9dfef37ed9e8080547f1acccbbb7f5712508e..ac0031e130efad0937ed806a0eb8fd469cbab105 100644 (file)
--- a/plugins/micron/micron-nvme.h
+++ b/plugins/micron/micron-nvme.h
@@ -6,7 +6,7 @@
 
 #include "cmd.h"
 
-PLUGIN(NAME("micron", "Micron vendor specific extensions"),
+PLUGIN(NAME("micron", "Micron vendor specific extensions", NVME_VERSION),
        COMMAND_LIST(
                ENTRY("select-download", "Selective Firmware Download", micron_selective_download)
                ENTRY("vs-temperature-stats", "Retrieve Micron temperature statistics ", micron_temp_stats)

diff --git a/plugins/netapp/netapp-nvme.h b/plugins/netapp/netapp-nvme.h
index d4eebd6eca88d03b47039a501dfe43abf67adfbf..2599db029220dbcbfa05d18d4506256efc82df39 100644 (file)
--- a/plugins/netapp/netapp-nvme.h
+++ b/plugins/netapp/netapp-nvme.h
@@ -6,7 +6,7 @@
 
 #include "cmd.h"
 
-PLUGIN(NAME("netapp", "NetApp vendor specific extensions"),
+PLUGIN(NAME("netapp", "NetApp vendor specific extensions", NVME_VERSION),
        COMMAND_LIST(
                ENTRY("smdevices", "NetApp SMdevices", netapp_smdevices)
                ENTRY("ontapdevices", "NetApp ONTAPdevices", netapp_ontapdevices)

diff --git a/plugins/nvidia/nvidia-nvme.h b/plugins/nvidia/nvidia-nvme.h
index bf562b91052d17119f4e89a4ffbc459e6bd40e95..74a20b8b6130d6d1f4e79eb944440a8e6fd73dd9 100644 (file)
--- a/plugins/nvidia/nvidia-nvme.h
+++ b/plugins/nvidia/nvidia-nvme.h
@@ -6,7 +6,7 @@
 
 #include "cmd.h"
 
-PLUGIN(NAME("nvidia", "NVIDIA vendor specific extensions"),
+PLUGIN(NAME("nvidia", "NVIDIA vendor specific extensions", NVME_VERSION),
        COMMAND_LIST(
                ENTRY("id-ctrl", "Send NVMe Identify Controller", id_ctrl)
        )

diff --git a/plugins/scaleflux/sfx-nvme.h b/plugins/scaleflux/sfx-nvme.h
index 8f145019037a0aa92b9a3a516551df59e199ed2c..fde5ba3d8aab2f9fc5a192a8767c7615ec514f91 100644 (file)
--- a/plugins/scaleflux/sfx-nvme.h
+++ b/plugins/scaleflux/sfx-nvme.h
@@ -6,7 +6,7 @@
 
 #include "cmd.h"
 
-PLUGIN(NAME("sfx", "ScaleFlux vendor specific extensions"),
+PLUGIN(NAME("sfx", "ScaleFlux vendor specific extensions", NVME_VERSION),
        COMMAND_LIST(
                ENTRY("smart-log-add", "Retrieve ScaleFlux SMART Log, show it", get_additional_smart_log)
                ENTRY("lat-stats", "Retrieve ScaleFlux IO Latency Statistics log, show it", get_lat_stats_log)

diff --git a/plugins/seagate/seagate-nvme.h b/plugins/seagate/seagate-nvme.h
index f5706978071ee299326008fcc18b1a955b875d3d..a4989f1ecc4a5f6e48eb057d31ab9d4185b9d871 100644 (file)
--- a/plugins/seagate/seagate-nvme.h
+++ b/plugins/seagate/seagate-nvme.h
@@ -27,7 +27,7 @@
 
 #include "cmd.h"
 
-PLUGIN(NAME("seagate", "Seagate vendor specific extensions"),
+PLUGIN(NAME("seagate", "Seagate vendor specific extensions", NVME_VERSION),
        COMMAND_LIST(
                ENTRY("vs-temperature-stats", "Retrieve Seagate temperature statistics ",          temp_stats)
                ENTRY("vs-log-page-sup",      "Retrieve Seagate Supported Log-pages Information ", log_pages_supp)

diff --git a/plugins/shannon/shannon-nvme.h b/plugins/shannon/shannon-nvme.h
index 019a3d6ef579c085dcdd47001b13df3022e3e247..46fc6970c0401aa97cfc9d7a4599811413f7c146 100644 (file)
--- a/plugins/shannon/shannon-nvme.h
+++ b/plugins/shannon/shannon-nvme.h
@@ -6,7 +6,7 @@
 
 #include "cmd.h"
 
-PLUGIN(NAME("shannon", "Shannon vendor specific extensions"),
+PLUGIN(NAME("shannon", "Shannon vendor specific extensions", NVME_VERSION),
        COMMAND_LIST(
                ENTRY("smart-log-add", "Retrieve Shannon SMART Log, show it", get_additional_smart_log)
                ENTRY("set-additioal-feature", "Set additional Shannon feature", set_additional_feature)

diff --git a/plugins/toshiba/toshiba-nvme.h b/plugins/toshiba/toshiba-nvme.h
index c405e78129d17c78eb33649d5cc7bed25617265c..ebd7575fab40c3c61c93ef986efff950b4303e82 100644 (file)
--- a/plugins/toshiba/toshiba-nvme.h
+++ b/plugins/toshiba/toshiba-nvme.h
@@ -7,7 +7,7 @@
 #include "cmd.h"
 #include "plugin.h"
 
-PLUGIN(NAME("toshiba", "Toshiba NVME plugin"),
+PLUGIN(NAME("toshiba", "Toshiba NVME plugin", NVME_VERSION),
     COMMAND_LIST(
                        ENTRY("vs-smart-add-log", "Extended SMART information", vendor_log)
                        ENTRY("vs-internal-log", "Get Internal Log", internal_log)

diff --git a/plugins/transcend/transcend-nvme.h b/plugins/transcend/transcend-nvme.h
index 14d62ec7df64e18338695ec9e0b61966c9d26b98..317793aa65b611c836ee8675ce912ec379b6bb6f 100644 (file)
--- a/plugins/transcend/transcend-nvme.h
+++ b/plugins/transcend/transcend-nvme.h
@@ -7,7 +7,7 @@
 #include "cmd.h"
  
 
-PLUGIN(NAME("transcend", "Transcend vendor specific extensions"),
+PLUGIN(NAME("transcend", "Transcend vendor specific extensions", NVME_VERSION),
     COMMAND_LIST(
                        ENTRY("healthvalue", "NVME health percentage", getHealthValue)
                        ENTRY("badblock", "Get NVME bad block number", getBadblock)

diff --git a/plugins/virtium/virtium-nvme.h b/plugins/virtium/virtium-nvme.h
index b95c910cf0fc5db0f2e610d423c7fc228d8cf2e4..124ab182a7d4bfe0a476f794287eeda9ee2fe5e0 100644 (file)
--- a/plugins/virtium/virtium-nvme.h
+++ b/plugins/virtium/virtium-nvme.h
@@ -7,7 +7,7 @@
 #include "cmd.h"
 #include "plugin.h"
 
-PLUGIN(NAME("virtium", "Virtium vendor specific extensions"),
+PLUGIN(NAME("virtium", "Virtium vendor specific extensions", NVME_VERSION),
     COMMAND_LIST(
             ENTRY("save-smart-to-vtview-log", "Periodically save smart attributes into a log file.\n\
                              The data in this log file can be analyzed using excel or using Virtium’s vtView.\n\

diff --git a/plugins/wdc/wdc-nvme.h b/plugins/wdc/wdc-nvme.h
index 9268f15b0166684ec75b702d4f10678177436118..10d506f6a57ea243d8ba21843859beee75a5e6d1 100644 (file)
--- a/plugins/wdc/wdc-nvme.h
+++ b/plugins/wdc/wdc-nvme.h
@@ -4,9 +4,10 @@
 #if !defined(WDC_NVME) || defined(CMD_HEADER_MULTI_READ)
 #define WDC_NVME
 
+#define WDC_PLUGIN_VERSION   "1.14.1"
 #include "cmd.h"
 
-PLUGIN(NAME("wdc", "Western Digital vendor specific extensions"),
+PLUGIN(NAME("wdc", "Western Digital vendor specific extensions", WDC_PLUGIN_VERSION),
        COMMAND_LIST(
                ENTRY("cap-diag", "WDC Capture-Diagnostics", wdc_cap_diag)
                ENTRY("drive-log", "WDC Drive Log", wdc_drive_log)

diff --git a/plugins/ymtc/ymtc-nvme.h b/plugins/ymtc/ymtc-nvme.h
index 739fd374489f38667769776da7081a5a349f01c3..c1ebc11eea5a99e7cebb585091c618ff53ca1db0 100644 (file)
--- a/plugins/ymtc/ymtc-nvme.h
+++ b/plugins/ymtc/ymtc-nvme.h
@@ -12,7 +12,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-PLUGIN(NAME("ymtc", "Ymtc vendor specific extensions"),
+PLUGIN(NAME("ymtc", "Ymtc vendor specific extensions", NVME_VERSION),
     COMMAND_LIST(
         ENTRY("smart-log-add", "Retrieve Ymtc SMART Log, show it", get_additional_smart_log)
     )

diff --git a/plugins/zns/zns.h b/plugins/zns/zns.h
index e05cf046f346fb4ebd67f005f25d8a7d064b9e0d..17011e1d7103f88198ee425d270c7808978345c2 100644 (file)
--- a/plugins/zns/zns.h
+++ b/plugins/zns/zns.h
@@ -6,7 +6,7 @@
 
 #include "cmd.h"
 
-PLUGIN(NAME("zns", "Zoned Namespace Command Set"),
+PLUGIN(NAME("zns", "Zoned Namespace Command Set", NVME_VERSION),
        COMMAND_LIST(
                ENTRY("list", "List all NVMe devices with Zoned Namespace Command Set support", list)
                ENTRY("id-ctrl", "Send NVMe Identify Zoned Namespace Controller, display structure", id_ctrl)