Skip to content

libnvme: move fabrics include list into its own file#3462

Merged
igaw merged 1 commit into
linux-nvme:masterfrom
martin-belanger:FABRICS_INCLUDE
Jun 22, 2026
Merged

libnvme: move fabrics include list into its own file#3462
igaw merged 1 commit into
linux-nvme:masterfrom
martin-belanger:FABRICS_INCLUDE

Conversation

@martin-belanger

Copy link
Copy Markdown

The fabrics-only headers appended to the generated libnvme.h were carried as a single \n-escaped string passed to libconf.set() in libnvme/src/meson.build. That form is hard to read and easy to get wrong when an include is added or removed.

This moves the list into libnvme/src/fabrics-includes.h.in (one #include per line) and pulls it in with fs.read().strip(). The generated libnvme.h is byte-identical.

Suggested by @igaw during the registry PR (#3425) review as a small, standalone preparation patch.

@igaw

igaw commented Jun 22, 2026

Copy link
Copy Markdown
Collaborator

I claim the assisted tag here! :)

The set of fabrics-only headers appended to the generated libnvme.h
was carried as a single \n-escaped string argument to libconf.set() in
meson.build. That form is hard to read and easy to get wrong when an
include is added or removed.

Move the include list into libnvme/src/fabrics-includes.h.in, one
directive per line, and pull it in with fs.read(). The generated
libnvme.h is unchanged.

Suggested-by: Daniel Wagner <wagi@kernel.org>
Signed-off-by: Martin Belanger <martin.belanger@dell.com>
@martin-belanger

Copy link
Copy Markdown
Author

Ha! Fair enough — the idea was yours, so I swapped the Assisted-by for a Suggested-by: Daniel Wagner wagi@kernel.org. Credit where it's due. 😄

@igaw igaw merged commit 0cebb59 into linux-nvme:master Jun 22, 2026
30 checks passed
@igaw

igaw commented Jun 22, 2026

Copy link
Copy Markdown
Collaborator

Thanks!

@martin-belanger martin-belanger deleted the FABRICS_INCLUDE branch June 22, 2026 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants