Use simpler plugin definition

Signed-off-by: Keith Busch <keith.busch@intel.com>

diff --git a/intel-nvme.c b/intel-nvme.c
index 4fc9d0749f9236d23e994ba6a3b985a0c262a4a9..0e8fad5f28101b0f20ad0d5bb63bbe909cad7e76 100644 (file)
--- a/intel-nvme.c
+++ b/intel-nvme.c
@@ -11,19 +11,6 @@
 #define CREATE_CMD
 #include "intel-nvme.h"
 
-static struct plugin intel_nvme = {
-       .name = "intel",
-       .desc = "Intel vendor specific extensions",
-       .next = NULL,
-       .commands = commands,
-};
-
-static void init() __attribute__((constructor));
-static void init()
-{
-       register_extension(&intel_nvme);
-}
-
 static void intel_id_ctrl(__u8 *vs)
 {
        char bl[9];

diff --git a/intel-nvme.h b/intel-nvme.h
index 62b9af810115b00e94fe96baf8fccbccd0b9ac42..d78aecbde52b83986c2d1eb572297091f6f5981d 100644 (file)
--- a/intel-nvme.h
+++ b/intel-nvme.h
@@ -6,12 +6,14 @@
 
 #include "cmd.h"
 
-COMMAND_LIST(
-       ENTRY("id-ctrl", "Send NVMe Identify Controller", id_ctrl)
-       ENTRY("smart-log-add", "Retrieve Intel SMART Log, show it", get_additional_smart_log)
-       ENTRY("market-name", "Retrieve Intel Marketing Name log, show it", get_market_log)
-       ENTRY("temp-stats", "Retrieve Intel Temperature Statistics log, show it", get_temp_stats_log)
-       ENTRY("lat-stats", "Retrieve Intel IO Latancy Statistics log, show it", get_lat_stats_log)
+PLUGIN(NAME("intel", "Intel vendor specific extensions"),
+       COMMAND_LIST(
+               ENTRY("id-ctrl", "Send NVMe Identify Controller", id_ctrl)
+               ENTRY("smart-log-add", "Retrieve Intel SMART Log, show it", get_additional_smart_log)
+               ENTRY("market-name", "Retrieve Intel Marketing Name log, show it", get_market_log)
+               ENTRY("temp-stats", "Retrieve Intel Temperature Statistics log, show it", get_temp_stats_log)
+               ENTRY("lat-stats", "Retrieve Intel IO Latancy Statistics log, show it", get_lat_stats_log)
+       )
 );
 
 #endif

diff --git a/lnvm-nvme.c b/lnvm-nvme.c
index 975d07de342e83e9d385253809380f78b1c9194a..2f888322711541f010bff7d6fb1724d32fcba683 100644 (file)
--- a/lnvm-nvme.c
+++ b/lnvm-nvme.c
@@ -14,18 +14,6 @@
 #define CREATE_CMD
 #include "lnvm-nvme.h"
 
-static struct plugin lnvm_nvme = {
-       .name = "lnvm",
-       .desc = "LightNVM specific extensions",
-       .commands = commands,
-};
-
-static void init() __attribute__((constructor));
-static void init()
-{
-       register_extension(&lnvm_nvme);
-}
-
 static int lnvm_init(int argc, char **argv, struct command *cmd, struct plugin *plugin)
 {
        const char *desc = "Initialize LightNVM device. A LightNVM/Open-Channel SSD"\

diff --git a/lnvm-nvme.h b/lnvm-nvme.h
index 65e7180c8cbae6812cf9911d150eb0c49293fc4a..293ec8f13eb85fb50d3757da8c586a2c224c0799 100644 (file)
--- a/lnvm-nvme.h
+++ b/lnvm-nvme.h
@@ -7,16 +7,18 @@
 
 #include "cmd.h"
 
-COMMAND_LIST(
-       ENTRY("list", "List available LightNVM devices", lnvm_list)
-       ENTRY("info", "List general information and available target engines", lnvm_info)
-       ENTRY("id-ns", "List geometry for LightNVM device", lnvm_id_ns)
-       ENTRY("init", "Initialize media manager on LightNVM device", lnvm_init)
-       ENTRY("create", "Create target on top of a LightNVM device", lnvm_create_tgt)
-       ENTRY("remove", "Remove target from device", lnvm_remove_tgt)
-       ENTRY("factory", "Reset device to factory state", lnvm_factory_init)
-       ENTRY("diag-bbtbl", "Diagnose bad block table", lnvm_get_bbtbl)
-       ENTRY("diag-set-bbtbl", "Update bad block table", lnvm_set_bbtbl)
+PLUGIN(NAME("lnvm", "LightNVM specific extensions"),
+       COMMAND_LIST(
+               ENTRY("list", "List available LightNVM devices", lnvm_list)
+               ENTRY("info", "List general information and available target engines", lnvm_info)
+               ENTRY("id-ns", "List geometry for LightNVM device", lnvm_id_ns)
+               ENTRY("init", "Initialize media manager on LightNVM device", lnvm_init)
+               ENTRY("create", "Create target on top of a LightNVM device", lnvm_create_tgt)
+               ENTRY("remove", "Remove target from device", lnvm_remove_tgt)
+               ENTRY("factory", "Reset device to factory state", lnvm_factory_init)
+               ENTRY("diag-bbtbl", "Diagnose bad block table", lnvm_get_bbtbl)
+               ENTRY("diag-set-bbtbl", "Update bad block table", lnvm_set_bbtbl)
+       )
 );
 
 #endif