From c13ccc2adb645bad8700ae89d94bf9d4b630aaa4 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Thu, 19 Sep 2024 14:55:52 +0200 Subject: [PATCH] nvme: Add bd_nvme_is_tech_avail to the API file Resolves: RHEL-59588 --- ...d_nvme_is_tech_avail-to-the-API-file.patch | 60 +++++++++++++++++++ libblockdev.spec | 7 ++- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 0014-nvme-Add-bd_nvme_is_tech_avail-to-the-API-file.patch diff --git a/0014-nvme-Add-bd_nvme_is_tech_avail-to-the-API-file.patch b/0014-nvme-Add-bd_nvme_is_tech_avail-to-the-API-file.patch new file mode 100644 index 0000000..be6b83a --- /dev/null +++ b/0014-nvme-Add-bd_nvme_is_tech_avail-to-the-API-file.patch @@ -0,0 +1,60 @@ +From 874f378ae48860be89807c8021f66d23d5c7da62 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Thu, 14 Mar 2024 13:53:04 +0100 +Subject: [PATCH] nvme: Add bd_nvme_is_tech_avail to the API file + +--- + src/lib/plugin_apis/nvme.api | 11 +++++++++++ + tests/nvme_test.py | 14 ++++++++++++++ + 2 files changed, 25 insertions(+) + +diff --git a/src/lib/plugin_apis/nvme.api b/src/lib/plugin_apis/nvme.api +index 667dbe9e..af892d8e 100644 +--- a/src/lib/plugin_apis/nvme.api ++++ b/src/lib/plugin_apis/nvme.api +@@ -66,6 +66,17 @@ typedef enum { + BD_NVME_TECH_MODE_INITIATOR = 1 << 2, + } BDNVMETechMode; + ++/** ++ * bd_nvme_is_tech_avail: ++ * @tech: the queried tech ++ * @mode: a bit mask of queried modes of operation (#BDNVMETechMode) for @tech ++ * @error: (out) (nullable): place to store error (details about why the @tech-@mode combination is not available) ++ * ++ * Returns: whether the @tech-@mode combination is available -- supported by the ++ * plugin implementation and having all the runtime dependencies available ++ */ ++gboolean bd_nvme_is_tech_avail (BDNVMETech tech, G_GNUC_UNUSED guint64 mode, GError **error); ++ + + /* BpG-skip */ + /** +diff --git a/tests/nvme_test.py b/tests/nvme_test.py +index 060d6ebc..ca4fec90 100644 +--- a/tests/nvme_test.py ++++ b/tests/nvme_test.py +@@ -27,6 +27,20 @@ class NVMeTest(unittest.TestCase): + BlockDev.reinit(cls.requested_plugins, True, None) + + ++class NVMePluginVersionTestCase(NVMeTest): ++ @tag_test(TestTags.NOSTORAGE) ++ def test_plugin_version(self): ++ self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.NVME), "libbd_nvme.so.2") ++ ++ @tag_test(TestTags.NOSTORAGE) ++ def test_availability(self): ++ avail = BlockDev.nvme_is_tech_avail(BlockDev.NVMETech.NVME, 0) ++ self.assertTrue(avail) ++ ++ avail = BlockDev.nvme_is_tech_avail(BlockDev.NVMETech.FABRICS, 0) ++ self.assertTrue(avail) ++ ++ + class NVMeTestCase(NVMeTest): + def setUp(self): + self.dev_file = None +-- +2.46.1 + diff --git a/libblockdev.spec b/libblockdev.spec index dab029d..27b06e5 100644 --- a/libblockdev.spec +++ b/libblockdev.spec @@ -129,7 +129,7 @@ Name: libblockdev Version: 2.28 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A library for low-level manipulation with block devices License: LGPLv2+ URL: https://github.com/storaged-project/libblockdev @@ -148,6 +148,7 @@ Patch10: 0010-lvm-Add-a-function-to-activate-LVs-in-shared-mode.patch Patch11: 0011-nvme_libblockdev-3.0.4_backport.patch Patch12: 0012-lvm-Add-support-for-starting-and-stopping-VG-locking.patch Patch13: 0013-tests-Remove_unreliable_nvme_attribute_checks.patch +Patch14: 0014-nvme-Add-bd_nvme_is_tech_avail-to-the-API-file.patch BuildRequires: make BuildRequires: glib2-devel @@ -1046,6 +1047,10 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %files plugins-all %changelog +* Thu Sep 19 2024 Vojtech Trefny - 2.28-12 +- nvme: Add bd_nvme_is_tech_avail to the API file + Resolves: RHEL-59588 + * Tue Nov 28 2023 Tomas Bzatek - 2.28-11 - tests: Remove unreliable nvme attribute checks Resolves: RHEL-16126