Skip to content

Commit fdcb92c

Browse files
lgdacunhigaw
authored andcommitted
plugins/solidigm: Warning for missing Telemetry object config
Warns if configuration file has telemetry object with different minor version Signed-off-by: Leonardo da Cunha <[email protected]>
1 parent 49424e2 commit fdcb92c

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

plugins/solidigm/solidigm-nvme.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include "cmd.h"
1515

16-
#define SOLIDIGM_PLUGIN_VERSION "1.18"
16+
#define SOLIDIGM_PLUGIN_VERSION "1.19"
1717

1818
PLUGIN(NAME("solidigm", "Solidigm vendor specific extensions", SOLIDIGM_PLUGIN_VERSION),
1919
COMMAND_LIST(

plugins/solidigm/solidigm-telemetry/config.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <json.h>
1414

1515
#include "config.h"
16+
#include "telemetry-log.h"
1617

1718
#define NOT_FOUND "NOT_FOUND"
1819

@@ -23,6 +24,7 @@
2324
#define NLOG_OBJ_PREFIX OBJ_NAME_PREFIX "NLOG_"
2425

2526
static bool config_get_by_version(const struct json_object *obj,
27+
const char *key,
2628
int version_major, int version_minor,
2729
struct json_object **value)
2830
{
@@ -42,6 +44,10 @@ static bool config_get_by_version(const struct json_object *obj,
4244
/* Try wildcard minor version if exact match failed */
4345
if (json_object_object_get_ex(major_obj, "*", value))
4446
return value != NULL;
47+
48+
SOLIDIGM_LOG_WARNING(
49+
"Warning: Object %s version major %d found but minor %d not found\n",
50+
key, version_major, version_minor);
4551
}
4652

4753
/* Try wildcard major version if exact major version not found */
@@ -66,7 +72,8 @@ bool sldm_config_get_struct_by_key_version(const struct json_object *config, cha
6672

6773
if (!json_object_object_get_ex(config, key, &token))
6874
return false;
69-
if (!config_get_by_version(token, version_major, version_minor, value))
75+
if (!config_get_by_version(token, key,
76+
version_major, version_minor, value))
7077
return false;
7178
return value != NULL;
7279
}

0 commit comments

Comments
 (0)