Skip to content

fabrics: add additional error messages for --concat #3063

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
Jan 16, 2026
+15 −0
Merged

fabrics: add additional error messages for --concat #3063

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e71b321
fabrics: add error if --tls and --concat are invoked together
martin-gpy Jan 16, 2026
7472fc3
fabrics: add error if no dhchap-secret is specified with --concat
martin-gpy Jan 16, 2026
33dff6d
fabrics: add error if dhchap-ctrl-secret is specified with --concat
martin-gpy Jan 16, 2026
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
15 changes: 15 additions & 0 deletions libnvme/src/nvme/fabrics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,21 @@

ctrlkey = nvme_ctrl_get_dhchap_key(c);

if (cfg->tls && cfg->concat) {
nvme_msg(h->ctx, LOG_ERR, "cannot specify --tls and --concat together\n");

Check failure on line 736 in libnvme/src/nvme/fabrics.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 90 exceeds 80 columns
return -ENVME_CONNECT_INVAL;
}

if (cfg->concat && !hostkey) {
nvme_msg(h->ctx, LOG_ERR, "required argument [--dhchap-secret | -S] not specified with --concat\n");

Check failure on line 741 in libnvme/src/nvme/fabrics.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 116 exceeds 80 columns
return -ENVME_CONNECT_INVAL;
}

if (cfg->concat && ctrlkey) {
nvme_msg(h->ctx, LOG_ERR, "cannot specify [--dhchap-ctrl-secret | -C] with --concat\n");

Check failure on line 746 in libnvme/src/nvme/fabrics.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 104 exceeds 80 columns
return -ENVME_CONNECT_INVAL;
}

if (cfg->tls) {
ret = __nvme_import_keys_from_config(h, c, &keyring_id, &key_id);
if (ret)
Expand Down