Skip to content

Commit 337926e

Browse files
committed
docs: add deprecation not to --hostid
The --hostid option is deprecated and ignored. Update the documentation accordingly. Signed-off-by: Daniel Wagner <[email protected]>
1 parent 1366385 commit 337926e

5 files changed

Lines changed: 10 additions & 9 deletions

File tree

Documentation/nvme-config.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ OPTIONS
115115

116116
-I <hostid>::
117117
--hostid=<hostid>::
118-
UUID(Universally Unique Identifier) to be discovered which should be
119-
formatted.
118+
Deprecated and ignored. This option is kept around for backwards
119+
compatibility. Use --hostnqn instead.
120120

121121
-S <secret>::
122122
--dhchap-secret=<secret>::

Documentation/nvme-connect-all.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ OPTIONS
105105

106106
-I <hostid>::
107107
--hostid=<hostid>::
108-
UUID(Universally Unique Identifier) to be discovered which should be
109-
formatted.
108+
Deprecated and ignored. This option is kept around for backwards
109+
compatibility. Use --hostnqn instead.
110110

111111
-r <filename>::
112112
--raw=<filename>::

Documentation/nvme-connect.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ OPTIONS
9393

9494
-I <hostid>::
9595
--hostid=<hostid>::
96-
UUID(Universally Unique Identifier) to be discovered which should be
97-
formatted.
96+
Deprecated and ignored. This option is kept around for backwards
97+
compatibility. Use --hostnqn instead.
9898

9999
-J <filename>::
100100
--config=<filename>::

Documentation/nvme-discover.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ OPTIONS
124124

125125
-I <hostid>::
126126
--hostid=<hostid>::
127-
UUID(Universally Unique Identifier) to be discovered which should be
128-
formatted.
127+
Deprecated and ignored. This option is kept around for backwards
128+
compatibility. Use --hostnqn instead.
129129

130130
-r <filename>::
131131
--raw=<filename>::

libnvme/src/nvme/fabrics.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,9 +705,10 @@ static int build_options(nvme_host_t h, nvme_ctrl_t c, char **argstr)
705705
{
706706
struct nvme_fabrics_config *cfg = nvme_ctrl_get_config(c);
707707
const char *transport = nvme_ctrl_get_transport(c);
708-
const char *hostnqn, *hostid, *hostkey, *ctrlkey = NULL;
708+
const char *hostnqn, *hostkey, *ctrlkey = NULL;
709709
bool discover = false, discovery_nqn = false;
710710
struct nvme_global_ctx *ctx = h->ctx;
711+
_cleanup_free_ char *hostid = NULL;
711712
long keyring_id = 0;
712713
long key_id = 0;
713714
int ret;

0 commit comments

Comments
 (0)