Skip to content

Commit 71cd80d

Browse files
committed
mi: fix nvme_mi_create_global_ctx removal
Not all users of nvme_mi_create_global_ctx and nvme_mi_free_global_ctx have been replaced. Fixes: c645b0c ("mi: replace nvme_mi_*global_context with nvme_*_global_context") Signed-off-by: Daniel Wagner <[email protected]>
1 parent 0226b16 commit 71cd80d

3 files changed

Lines changed: 4 additions & 6 deletions

File tree

libnvme/examples/mi-conf.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ int main(int argc, char **argv)
157157
if (rc)
158158
errx(EXIT_FAILURE, "can't parse MI device string '%s'", devstr);
159159

160-
ctx = nvme_mi_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
160+
ctx = nvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
161161
if (!ctx)
162162
err(EXIT_FAILURE, "can't create global context");
163163

@@ -219,7 +219,7 @@ int main(int argc, char **argv)
219219
dbus_error_free(&berr);
220220
nvme_mi_close(ep);
221221
out_free_ctx:
222-
nvme_mi_free_global_ctx(ctx);
222+
nvme_free_global_ctx(ctx);
223223

224224
return rc ? EXIT_FAILURE : EXIT_SUCCESS;
225225
}

libnvme/src/libnvme.ld

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,12 @@ LIBNVME_2_0 {
132132
nvme_mi_close;
133133
nvme_mi_close_transport_handle;
134134
nvme_mi_control;
135-
nvme_mi_create_global_ctx;
136135
nvme_mi_ctrl_id;
137136
nvme_mi_endpoint_desc;
138137
nvme_mi_ep_get_timeout;
139138
nvme_mi_ep_set_timeout;
140139
nvme_mi_first_ctrl;
141140
nvme_mi_first_endpoint;
142-
nvme_mi_free_global_ctx;
143141
nvme_mi_init_transport_handle;
144142
nvme_mi_mi_config_get;
145143
nvme_mi_mi_config_set;

libnvme/src/nvme/mi-mctp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ struct nvme_global_ctx *nvme_mi_scan_mctp(void)
954954
dbus_bool_t drc;
955955
DBusError berr;
956956

957-
ctx = nvme_mi_create_global_ctx(NULL, DEFAULT_LOGLEVEL);
957+
ctx = nvme_create_global_ctx(NULL, DEFAULT_LOGLEVEL);
958958
if (!ctx) {
959959
errno = ENOMEM;
960960
return NULL;
@@ -1028,7 +1028,7 @@ struct nvme_global_ctx *nvme_mi_scan_mctp(void)
10281028

10291029
if (rc < 0) {
10301030
if (ctx) {
1031-
nvme_mi_free_global_ctx(ctx);
1031+
nvme_free_global_ctx(ctx);
10321032
}
10331033
errno = errno_save;
10341034
ctx = NULL;

0 commit comments

Comments
 (0)