Skip to content

Commit e2e0bcf

Browse files
igawigaw
committed
rename: nvme_ -> libnvme_ prefix for all library symbols
Rename all library-level symbols from nvme_ to libnvme_ prefix. Signed-off-by: Daniel Wagner <[email protected]>
1 parent 013f3a9 commit e2e0bcf

139 files changed

Lines changed: 7997 additions & 7856 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎fabrics.c‎

Lines changed: 111 additions & 111 deletions
Large diffs are not rendered by default.

‎libnvme/examples/discover-loop.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,29 +52,29 @@ static void print_discover_log(struct nvmf_discovery_log *log)
5252
int main()
5353
{
5454
struct nvmf_discovery_log *log;
55-
struct nvme_global_ctx *ctx;
56-
nvme_host_t h;
57-
nvme_ctrl_t c;
55+
struct libnvme_global_ctx *ctx;
56+
libnvme_host_t h;
57+
libnvme_ctrl_t c;
5858
int ret;
59-
struct nvme_fabrics_config cfg;
59+
struct libnvme_fabrics_config cfg;
6060

6161
nvmf_default_config(&cfg);
6262

63-
ctx = nvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
63+
ctx = libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
6464
if (!ctx)
6565
return 1;
6666

67-
ret = nvme_scan_topology(ctx, NULL, NULL);
67+
ret = libnvme_scan_topology(ctx, NULL, NULL);
6868
if (ret) {
69-
nvme_free_global_ctx(ctx);
69+
libnvme_free_global_ctx(ctx);
7070
return 1;
7171
}
72-
ret = nvme_get_host(ctx, NULL, NULL, &h);
72+
ret = libnvme_get_host(ctx, NULL, NULL, &h);
7373
if (ret) {
7474
fprintf(stderr, "Failed to allocated memory\n");
7575
return 1;
7676
}
77-
ret = nvme_create_ctrl(ctx, NVME_DISC_SUBSYS_NAME, "loop",
77+
ret = libnvme_create_ctrl(ctx, NVME_DISC_SUBSYS_NAME, "loop",
7878
NULL, NULL, NULL, NULL, &c);
7979
if (ret) {
8080
fprintf(stderr, "Failed to allocate memory\n");
@@ -87,15 +87,15 @@ int main()
8787
}
8888

8989
ret = nvmf_get_discovery_log(c, &log, 4);
90-
nvme_disconnect_ctrl(c);
91-
nvme_free_ctrl(c);
90+
libnvme_disconnect_ctrl(c);
91+
libnvme_free_ctrl(c);
9292

9393
if (ret)
9494
fprintf(stderr, "nvmf-discover-log:%x\n", ret);
9595
else
9696
print_discover_log(log);
9797

98-
nvme_free_global_ctx(ctx);
98+
libnvme_free_global_ctx(ctx);
9999
free(log);
100100
return 0;
101101
}

‎libnvme/examples/display-columnar.c‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -17,36 +17,36 @@
1717
static const char dash[101] = {[0 ... 99] = '-'};
1818
int main()
1919
{
20-
struct nvme_global_ctx *ctx;
21-
nvme_host_t h;
22-
nvme_subsystem_t s;
23-
nvme_ctrl_t c;
24-
nvme_path_t p;
25-
nvme_ns_t n;
20+
struct libnvme_global_ctx *ctx;
21+
libnvme_host_t h;
22+
libnvme_subsystem_t s;
23+
libnvme_ctrl_t c;
24+
libnvme_path_t p;
25+
libnvme_ns_t n;
2626
int err;
2727

28-
ctx = nvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
28+
ctx = libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
2929
if (!ctx)
3030
return 1;
3131

32-
err = nvme_scan_topology(ctx, NULL, NULL);
32+
err = libnvme_scan_topology(ctx, NULL, NULL);
3333
if (err) {
34-
nvme_free_global_ctx(ctx);
34+
libnvme_free_global_ctx(ctx);
3535
return 1;
3636
}
3737

3838
printf("%-16s %-96s %-.16s\n", "Subsystem", "Subsystem-NQN", "Controllers");
3939
printf("%-.16s %-.96s %-.16s\n", dash, dash, dash);
4040

41-
nvme_for_each_host(ctx, h) {
42-
nvme_for_each_subsystem(h, s) {
41+
libnvme_for_each_host(ctx, h) {
42+
libnvme_for_each_subsystem(h, s) {
4343
bool first = true;
44-
printf("%-16s %-96s ", nvme_subsystem_get_name(s),
45-
nvme_subsystem_get_subsysnqn(s));
44+
printf("%-16s %-96s ", libnvme_subsystem_get_name(s),
45+
libnvme_subsystem_get_subsysnqn(s));
4646

47-
nvme_subsystem_for_each_ctrl(s, c) {
47+
libnvme_subsystem_for_each_ctrl(s, c) {
4848
printf("%s%s", first ? "": ", ",
49-
nvme_ctrl_get_name(c));
49+
libnvme_ctrl_get_name(c));
5050
first = false;
5151
}
5252
printf("\n");
@@ -59,29 +59,29 @@ int main()
5959
printf("%-.8s %-.20s %-.40s %-.8s %-.6s %-.14s %-.12s %-.16s\n", dash, dash,
6060
dash, dash, dash, dash, dash, dash);
6161

62-
nvme_for_each_host(ctx, h) {
63-
nvme_for_each_subsystem(h, s) {
64-
nvme_subsystem_for_each_ctrl(s, c) {
62+
libnvme_for_each_host(ctx, h) {
63+
libnvme_for_each_subsystem(h, s) {
64+
libnvme_subsystem_for_each_ctrl(s, c) {
6565
bool first = true;
6666

6767
printf("%-8s %-20s %-40s %-8s %-6s %-14s %-12s ",
68-
nvme_ctrl_get_name(c),
69-
nvme_ctrl_get_serial(c),
70-
nvme_ctrl_get_model(c),
71-
nvme_ctrl_get_firmware(c),
72-
nvme_ctrl_get_transport(c),
73-
nvme_ctrl_get_traddr(c),
74-
nvme_subsystem_get_name(s));
75-
76-
nvme_ctrl_for_each_ns(c, n) {
68+
libnvme_ctrl_get_name(c),
69+
libnvme_ctrl_get_serial(c),
70+
libnvme_ctrl_get_model(c),
71+
libnvme_ctrl_get_firmware(c),
72+
libnvme_ctrl_get_transport(c),
73+
libnvme_ctrl_get_traddr(c),
74+
libnvme_subsystem_get_name(s));
75+
76+
libnvme_ctrl_for_each_ns(c, n) {
7777
printf("%s%s", first ? "": ", ",
78-
nvme_ns_get_name(n));
78+
libnvme_ns_get_name(n));
7979
first = false;
8080
}
8181

82-
nvme_ctrl_for_each_path(c, p) {
82+
libnvme_ctrl_for_each_path(c, p) {
8383
printf("%s%s", first ? "": ", ",
84-
nvme_ns_get_name(nvme_path_get_ns(p)));
84+
libnvme_ns_get_name(libnvme_path_get_ns(p)));
8585
first = false;
8686
}
8787
printf("\n");
@@ -93,29 +93,29 @@ int main()
9393
printf("%-12s %-8s %-16s %-8s %-16s\n", "Device", "NSID", "Sectors", "Format", "Controllers");
9494
printf("%-.12s %-.8s %-.16s %-.8s %-.16s\n", dash, dash, dash, dash, dash);
9595

96-
nvme_for_each_host(ctx, h) {
97-
nvme_for_each_subsystem(h, s) {
98-
nvme_subsystem_for_each_ctrl(s, c) {
99-
nvme_ctrl_for_each_ns(c, n)
96+
libnvme_for_each_host(ctx, h) {
97+
libnvme_for_each_subsystem(h, s) {
98+
libnvme_subsystem_for_each_ctrl(s, c) {
99+
libnvme_ctrl_for_each_ns(c, n)
100100
printf("%-12s %-8d %-16" PRIu64 " %-8d %s\n",
101-
nvme_ns_get_name(n),
102-
nvme_ns_get_nsid(n),
103-
nvme_ns_get_lba_count(n),
104-
nvme_ns_get_lba_size(n),
105-
nvme_ctrl_get_name(c));
101+
libnvme_ns_get_name(n),
102+
libnvme_ns_get_nsid(n),
103+
libnvme_ns_get_lba_count(n),
104+
libnvme_ns_get_lba_size(n),
105+
libnvme_ctrl_get_name(c));
106106
}
107107

108-
nvme_subsystem_for_each_ns(s, n) {
108+
libnvme_subsystem_for_each_ns(s, n) {
109109
bool first = true;
110110

111111
printf("%-12s %-8d %-16" PRIu64 " %-8d ",
112-
nvme_ns_get_name(n),
113-
nvme_ns_get_nsid(n),
114-
nvme_ns_get_lba_count(n),
115-
nvme_ns_get_lba_size(n));
116-
nvme_subsystem_for_each_ctrl(s, c) {
112+
libnvme_ns_get_name(n),
113+
libnvme_ns_get_nsid(n),
114+
libnvme_ns_get_lba_count(n),
115+
libnvme_ns_get_lba_size(n));
116+
libnvme_subsystem_for_each_ctrl(s, c) {
117117
printf("%s%s", first ? "" : ", ",
118-
nvme_ctrl_get_name(c));
118+
libnvme_ctrl_get_name(c));
119119
first = false;
120120
}
121121
printf("\n");

‎libnvme/examples/display-tree.c‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,64 +16,64 @@
1616

1717
int main()
1818
{
19-
struct nvme_global_ctx *ctx;
20-
nvme_host_t h;
21-
nvme_subsystem_t s, _s;
22-
nvme_ctrl_t c, _c;
23-
nvme_path_t p, _p;
24-
nvme_ns_t n, _n;
19+
struct libnvme_global_ctx *ctx;
20+
libnvme_host_t h;
21+
libnvme_subsystem_t s, _s;
22+
libnvme_ctrl_t c, _c;
23+
libnvme_path_t p, _p;
24+
libnvme_ns_t n, _n;
2525
int err;
2626

27-
ctx = nvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
27+
ctx = libnvme_create_global_ctx(stdout, DEFAULT_LOGLEVEL);
2828
if (!ctx)
2929
return 1;
3030

31-
err = nvme_scan_topology(ctx, NULL, NULL);
31+
err = libnvme_scan_topology(ctx, NULL, NULL);
3232
if (err) {
33-
nvme_free_global_ctx(ctx);
33+
libnvme_free_global_ctx(ctx);
3434
return 1;
3535
}
3636

3737
printf(".\n");
38-
nvme_for_each_host(ctx, h) {
39-
nvme_for_each_subsystem_safe(h, s, _s) {
38+
libnvme_for_each_host(ctx, h) {
39+
libnvme_for_each_subsystem_safe(h, s, _s) {
4040
printf("%c-- %s - NQN=%s\n", _s ? '|' : '`',
41-
nvme_subsystem_get_name(s),
42-
nvme_subsystem_get_subsysnqn(s));
41+
libnvme_subsystem_get_name(s),
42+
libnvme_subsystem_get_subsysnqn(s));
4343

44-
nvme_subsystem_for_each_ns_safe(s, n, _n) {
44+
libnvme_subsystem_for_each_ns_safe(s, n, _n) {
4545
printf("%c |-- %s lba size:%d lba max:%" PRIu64 "\n",
4646
_s ? '|' : ' ',
47-
nvme_ns_get_name(n),
48-
nvme_ns_get_lba_size(n),
49-
nvme_ns_get_lba_count(n));
47+
libnvme_ns_get_name(n),
48+
libnvme_ns_get_lba_size(n),
49+
libnvme_ns_get_lba_count(n));
5050
}
5151

52-
nvme_subsystem_for_each_ctrl_safe(s, c, _c) {
52+
libnvme_subsystem_for_each_ctrl_safe(s, c, _c) {
5353
printf("%c %c-- %s %s %s %s\n",
5454
_s ? '|' : ' ', _c ? '|' : '`',
55-
nvme_ctrl_get_name(c),
56-
nvme_ctrl_get_transport(c),
57-
nvme_ctrl_get_traddr(c),
58-
nvme_ctrl_get_state(c));
55+
libnvme_ctrl_get_name(c),
56+
libnvme_ctrl_get_transport(c),
57+
libnvme_ctrl_get_traddr(c),
58+
libnvme_ctrl_get_state(c));
5959

60-
nvme_ctrl_for_each_ns_safe(c, n, _n)
60+
libnvme_ctrl_for_each_ns_safe(c, n, _n)
6161
printf("%c %c %c-- %s lba size:%d lba max:%" PRIu64 "\n",
6262
_s ? '|' : ' ', _c ? '|' : ' ',
6363
_n ? '|' : '`',
64-
nvme_ns_get_name(n),
65-
nvme_ns_get_lba_size(n),
66-
nvme_ns_get_lba_count(n));
64+
libnvme_ns_get_name(n),
65+
libnvme_ns_get_lba_size(n),
66+
libnvme_ns_get_lba_count(n));
6767

68-
nvme_ctrl_for_each_path_safe(c, p, _p)
68+
libnvme_ctrl_for_each_path_safe(c, p, _p)
6969
printf("%c %c %c-- %s %s\n",
7070
_s ? '|' : ' ', _c ? '|' : ' ',
7171
_p ? '|' : '`',
72-
nvme_path_get_name(p),
73-
nvme_path_get_ana_state(p));
72+
libnvme_path_get_name(p),
73+
libnvme_path_get_ana_state(p));
7474
}
7575
}
7676
}
77-
nvme_free_global_ctx(ctx);
77+
libnvme_free_global_ctx(ctx);
7878
return 0;
7979
}

‎libnvme/examples/mi-conf.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ int set_local_mtu(DBusConnection *bus, unsigned int net, uint8_t eid,
137137

138138
int main(int argc, char **argv)
139139
{
140-
struct nvme_global_ctx *ctx;
140+
struct libnvme_global_ctx *ctx;
141141
uint16_t cur_mtu, mtu;
142142
DBusConnection *bus;
143143
const char *devstr;
@@ -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_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
160+
ctx = libnvme_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_free_global_ctx(ctx);
222+
libnvme_free_global_ctx(ctx);
223223

224224
return rc ? EXIT_FAILURE : EXIT_SUCCESS;
225225
}

‎libnvme/examples/mi-mctp-ae.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ enum nvme_mi_aem_handler_next_action aem_handler(nvme_mi_ep_t ep, size_t num_eve
7979

8080
int main(int argc, char **argv)
8181
{
82-
struct nvme_global_ctx *ctx;
82+
struct libnvme_global_ctx *ctx;
8383
nvme_mi_ep_t ep;
8484
uint8_t eid = 0;
8585
int rc = 0, net = 0;
@@ -110,7 +110,7 @@ int main(int argc, char **argv)
110110
return EXIT_FAILURE;
111111
}
112112

113-
ctx = nvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
113+
ctx = libnvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
114114
if (!ctx)
115115
err(EXIT_FAILURE, "can't create NVMe root");
116116

@@ -174,7 +174,7 @@ int main(int argc, char **argv)
174174
//Cleanup
175175
nvme_mi_aem_disable(ep);
176176
nvme_mi_close(ep);
177-
nvme_free_global_ctx(ctx);
177+
libnvme_free_global_ctx(ctx);
178178

179179
return rc ? EXIT_FAILURE : EXIT_SUCCESS;
180180
}

0 commit comments

Comments
 (0)