Skip to content

nbft: enable nbft-plugin.c build without json-c dependencies checking #2638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igaw merged 3 commits into from
Dec 20, 2024
Merged

nbft: enable nbft-plugin.c build without json-c dependencies checking #2638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ce3f7d
nbft: enable nbft-plugin.c build without json-c dependencies checking
ikegami-t Dec 20, 2024
4f70d4c
netapp: enable netapp-nvme.c build without json-c dependencies checking
ikegami-t Dec 20, 2024
62b4e57
nvidia: build plugin not depended on json without json
ikegami-t Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions plugins/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

if json_c_dep.found()
sources += [
'plugins/nbft/nbft-plugin.c',
'plugins/netapp/netapp-nvme.c',
'plugins/nvidia/nvidia-nvme.c',
'plugins/scaleflux/sfx-nvme.c',
'plugins/seagate/seagate-nvme.c',
'plugins/solidigm/solidigm-nvme.c',
Expand All @@ -27,13 +24,16 @@ sources += [
'plugins/intel/intel-nvme.c',
'plugins/memblaze/memblaze-nvme.c',
'plugins/micron/micron-nvme.c',
'plugins/nbft/nbft-plugin.c',
'plugins/netapp/netapp-nvme.c',
'plugins/nvidia/nvidia-nvme.c',
'plugins/shannon/shannon-nvme.c',
'plugins/toshiba/toshiba-nvme.c',
'plugins/transcend/transcend-nvme.c',
'plugins/virtium/virtium-nvme.c',
'plugins/ymtc/ymtc-nvme.c',
'plugins/zns/zns.c',
]
]

subdir('ocp')
subdir('lm')
Expand Down
4 changes: 4 additions & 0 deletions plugins/nbft/nbft-plugin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ static char *mac_addr_to_string(unsigned char mac_addr[6])
return mac_string;
}

#ifdef CONFIG_JSONC
static json_object *hfi_to_json(struct nbft_info_hfi *hfi)
{
struct json_object *hfi_json;
Expand Down Expand Up @@ -348,6 +349,9 @@ static int json_show_nbfts(struct list_head *nbft_list, bool show_subsys,
json_free_object(nbft_json_array);
return -ENOMEM;
}
#else /* CONFIG_JSONC */
#define json_show_nbfts(nbft_list, show_subsys, show_hfi, show_discovery) -EINVAL
#endif /* CONFIG_JSONC */

static void print_nbft_hfi_info(struct nbft_info *nbft)
{
Expand Down
12 changes: 12 additions & 0 deletions plugins/netapp/netapp-nvme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ static void netapp_get_ontap_labels(char *vsname, char *nspath,
}
}

#ifdef CONFIG_JSONC
static void netapp_smdevice_json(struct json_object *devices, char *devname,
char *arrayname, char *volname, int nsid, char *nguid,
char *ctrl, char *astate, char *version, unsigned long long lba,
Expand Down Expand Up @@ -293,6 +294,7 @@ static void netapp_ontapdevice_json(struct json_object *devices, char *devname,

json_array_add_value_object(devices, device_attrs);
}
#endif /* CONFIG_JSONC */

static void netapp_smdevices_print_verbose(struct smdevice_info *devices,
int count, int format, const char *devname)
Expand Down Expand Up @@ -440,6 +442,7 @@ static void netapp_smdevices_print_regular(struct smdevice_info *devices,
}
}

#ifdef CONFIG_JSONC
static void netapp_smdevices_print_json(struct smdevice_info *devices,
int count, const char *devname)
{
Expand Down Expand Up @@ -508,6 +511,9 @@ static void netapp_smdevices_print_json(struct smdevice_info *devices,
printf("\n");
json_free_object(root);
}
#else /* CONFIG_JSONC */
#define netapp_smdevices_print_json(devices, count, devname)
#endif /* CONFIG_JSONC */

static void netapp_ontapdevices_print_verbose(struct ontapdevice_info *devices,
int count, int format, const char *devname)
Expand Down Expand Up @@ -623,6 +629,7 @@ static void netapp_ontapdevices_print_regular(struct ontapdevice_info *devices,
}
}

#ifdef CONFIG_JSONC
static void netapp_ontapdevices_print_json(struct ontapdevice_info *devices,
int count, const char *devname)
{
Expand Down Expand Up @@ -679,6 +686,9 @@ static void netapp_ontapdevices_print_json(struct ontapdevice_info *devices,
printf("\n");
json_free_object(root);
}
#else /* CONFIG_JSONC */
#define netapp_ontapdevices_print_json(devices, count, devname)
#endif /* CONFIG_JSONC */

static int nvme_get_ontap_c2_log(int fd, __u32 nsid, void *buf, __u32 buflen)
{
Expand Down Expand Up @@ -829,8 +839,10 @@ static int netapp_output_format(char *format)
return -EINVAL;
if (!strcmp(format, "normal"))
return NNORMAL;
#ifdef CONFIG_JSONC
if (!strcmp(format, "json"))
return NJSON;
#endif /* CONFIG_JSONC */
if (!strcmp(format, "column"))
return NCOLUMN;
return -EINVAL;
Expand Down
Loading