NVMeD: Fix the clang-tidy errors Google-Bug-Id: 434718433 Change-Id: Ied40d76acc379a550e68adac4c2e9ab6ed3facb2 Signed-off-by: Muhammad Usama <muhammadusama@google.com>
diff --git a/src/NVMeDrive.cpp b/src/NVMeDrive.cpp index 1cd2c78..48bb6c1 100644 --- a/src/NVMeDrive.cpp +++ b/src/NVMeDrive.cpp
@@ -5,7 +5,7 @@ #include <iostream> -namespace CommonErr = sdbusplus::xyz::openbmc_project::Common::Error; +namespace common_err = sdbusplus::xyz::openbmc_project::Common::Error; NVMeDrive::NVMeDrive(boost::asio::io_context& io, const std::shared_ptr<sdbusplus::asio::connection>& conn, @@ -51,7 +51,7 @@ // NOLINTNEXTLINE(cert-err09-cpp,cert-err60-cpp,cert-err61-cpp,misc-throw-by-value-catch-by-reference) throw *makeLibNVMeError( "sanitize already in progress with different parameters", - std::make_shared<CommonErr::Unavailable>()); + std::make_shared<common_err::Unavailable>()); } sanitizeParams = params; @@ -133,7 +133,7 @@ self->erasePercentage(0.0); self->eraseInProgress(false); self->errorName( - CommonErr::DeviceOperationFailed::errName); + common_err::DeviceOperationFailed::errName); self->errorDescription("Sanitize operation failed"); } else if (inProgress)
diff --git a/src/NVMeError.cpp b/src/NVMeError.cpp index 2764288..eda98de 100644 --- a/src/NVMeError.cpp +++ b/src/NVMeError.cpp
@@ -5,7 +5,7 @@ #include <xyz/openbmc_project/Common/Device/error.hpp> #include <xyz/openbmc_project/Common/error.hpp> -namespace CommonErr = sdbusplus::xyz::openbmc_project::Common::Error; +namespace common_err = sdbusplus::xyz::openbmc_project::Common::Error; NVMeSdBusPlusError::NVMeSdBusPlusError(std::string_view desc) : desc(desc) { @@ -37,7 +37,7 @@ { return specific->name(); } - return CommonErr::InternalFailure().name(); + return common_err::InternalFailure().name(); } const char* NVMeSdBusPlusError::description() const noexcept @@ -86,48 +86,48 @@ switch (sc) { case NVME_SC_INVALID_FIELD: - specific = std::make_shared<CommonErr::InvalidArgument>(); + specific = std::make_shared<common_err::InvalidArgument>(); break; case NVME_SC_CAP_EXCEEDED: - specific = std::make_shared<CommonErr::TooManyResources>(); + specific = std::make_shared<common_err::TooManyResources>(); break; case NVME_SC_SANITIZE_IN_PROGRESS: - specific = std::make_shared<CommonErr::Unavailable>(); + specific = std::make_shared<common_err::Unavailable>(); break; default: specific = - std::make_shared<CommonErr::DeviceOperationFailed>(); + std::make_shared<common_err::DeviceOperationFailed>(); } break; case NVME_SCT_CMD_SPECIFIC: switch (sc) { case NVME_SC_INVALID_FORMAT: - specific = std::make_shared<CommonErr::InvalidArgument>(); + specific = std::make_shared<common_err::InvalidArgument>(); break; case NVME_SC_INSUFFICIENT_CAP: case NVME_SC_NS_INSUFFICIENT_CAP: case NVME_SC_NS_ID_UNAVAILABLE: case NVME_SC_NS_ATTACHMENT_LIMIT_EXCEEDED: - specific = std::make_shared<CommonErr::TooManyResources>(); + specific = std::make_shared<common_err::TooManyResources>(); break; case NVME_SC_FW_NEEDS_SUBSYS_RESET: case NVME_SC_FW_NEEDS_RESET: - specific = std::make_shared<CommonErr::Unavailable>(); + specific = std::make_shared<common_err::Unavailable>(); break; default: specific = - std::make_shared<CommonErr::DeviceOperationFailed>(); + std::make_shared<common_err::DeviceOperationFailed>(); } break; default: - specific = std::make_shared<CommonErr::DeviceOperationFailed>(); + specific = std::make_shared<common_err::DeviceOperationFailed>(); } // always return the description from libnvme @@ -144,21 +144,21 @@ switch (val) { case NVME_MI_RESP_INVALID_PARAM: - specific = std::make_shared<CommonErr::InvalidArgument>(); + specific = std::make_shared<common_err::InvalidArgument>(); break; case NVME_MI_RESP_SANITIZE_IN_PROGRESS: - specific = std::make_shared<CommonErr::Unavailable>(); + specific = std::make_shared<common_err::Unavailable>(); break; // INVALID_CMD_SIZE is returned by some drives case NVME_MI_RESP_INVALID_OPCODE: case NVME_MI_RESP_INVALID_CMD_SIZE: - specific = std::make_shared<CommonErr::UnsupportedRequest>(); + specific = std::make_shared<common_err::UnsupportedRequest>(); break; default: - specific = std::make_shared<CommonErr::DeviceOperationFailed>(); + specific = std::make_shared<common_err::DeviceOperationFailed>(); } // always return the description from libnvme
diff --git a/src/NVMeMi.cpp b/src/NVMeMi.cpp index fad24d2..1b01d89 100644 --- a/src/NVMeMi.cpp +++ b/src/NVMeMi.cpp
@@ -13,7 +13,7 @@ #include <iostream> #include <stdexcept> -namespace CommonErr = sdbusplus::xyz::openbmc_project::Common::Error; +namespace common_err = sdbusplus::xyz::openbmc_project::Common::Error; // libnvme-mi root service nvme_root_t NVMeMi::nvmeRoot = nvme_mi_create_root(stderr, DEFAULT_LOGLEVEL); @@ -1588,7 +1588,7 @@ { throw makeLibNVMeError("LBA format out of range, maximum is " + std::to_string(maxLbaf), - std::make_shared<CommonErr::InvalidArgument>()); + std::make_shared<common_err::InvalidArgument>()); } return 1 << id.lbaf[lbaFormat].ds; @@ -1610,7 +1610,7 @@ try { - blockSize = self->getBlockSize(ctrl, lbaFormat); + blockSize = NVMeMi::getBlockSize(ctrl, lbaFormat); } // TODO: (b/375054188) Exception handling to be refactored // NOLINTNEXTLINE(cert-err09-cpp,cert-err60-cpp,cert-err61-cpp,misc-throw-by-value-catch-by-reference) @@ -1626,7 +1626,7 @@ std::string("Size must be a multiple of the block size ") + std::to_string(blockSize); submittedCb(makeLibNVMeError( - msg, std::make_shared<CommonErr::InvalidArgument>())); + msg, std::make_shared<common_err::InvalidArgument>())); return; }
diff --git a/tests/test_nvme_mi.cpp b/tests/test_nvme_mi.cpp index d069540..65640aa 100644 --- a/tests/test_nvme_mi.cpp +++ b/tests/test_nvme_mi.cpp
@@ -129,14 +129,14 @@ MOCK_METHOD( void, adminSecuritySend, - (nvme_mi_ctrl_t ctrl, uint8_t proto, uint16_t proto_specific, + (nvme_mi_ctrl_t ctrl, uint8_t proto, uint16_t protoSpecific, std::span<uint8_t> data, - std::function<void(const std::error_code&, int nvme_status)>&& cb), + std::function<void(const std::error_code&, int nvmeStatus)>&& cb), (override)); MOCK_METHOD(void, adminSecurityReceive, - (nvme_mi_ctrl_t ctrl, uint8_t proto, uint16_t proto_specific, - uint32_t transfer_length, - std::function<void(const std::error_code&, int nvme_status, + (nvme_mi_ctrl_t ctrl, uint8_t proto, uint16_t protoSpecific, + uint32_t transferLength, + std::function<void(const std::error_code&, int nvmeStatus, const std::span<uint8_t> data)>&& cb), (override)); @@ -150,27 +150,27 @@ (nvme_mi_ctrl_t ctrl, uint8_t opcode, uint32_t cdw1, uint32_t cdw2, uint32_t cdw3, uint32_t cdw10, uint32_t cdw11, uint32_t cdw12, uint32_t cdw13, uint32_t cdw14, uint32_t cdw15, - std::function<void(const std::error_code&, int nvme_status, - uint32_t comption_dw0)>&& cb), + std::function<void(const std::error_code&, int nvmeStatus, + uint32_t comptionDw0)>&& cb), (override)); MOCK_METHOD(void, createNamespace, - (nvme_mi_ctrl_t ctrl, uint64_t size, size_t lba_format, - bool metadata_at_end, - std::function<void(nvme_ex_ptr ex)>&& submitted_cb, + (nvme_mi_ctrl_t ctrl, uint64_t size, size_t lbaFormat, + bool metadataAtEnd, + std::function<void(nvme_ex_ptr ex)>&& submittedCB, std::function<void(nvme_ex_ptr ex, NVMeNSIdentify newid)>&& - finished_cb), + finishedCB), (override)); MOCK_METHOD( void, adminDeleteNamespace, (nvme_mi_ctrl_t ctrl, uint32_t nsid, - std::function<void(const std::error_code&, int nvme_status)>&& cb), + std::function<void(const std::error_code&, int nvmeStatus)>&& cb), (override)); MOCK_METHOD( void, adminAttachDetachNamespace, (nvme_mi_ctrl_t ctrl, uint16_t ctrlid, uint32_t nsid, bool attach, - std::function<void(const std::error_code&, int nvme_status)>&& cb), + std::function<void(const std::error_code&, int nvmeStatus)>&& cb), (override)); MOCK_METHOD( @@ -181,7 +181,7 @@ MOCK_METHOD(void, adminSanitize, (nvme_mi_ctrl_t ctrl, enum nvme_sanitize_sanact sanact, - uint8_t passes, uint32_t pattern, bool invert_pattern, + uint8_t passes, uint32_t pattern, bool invertPattern, std::function<void(nvme_ex_ptr ex)>&& cb), (override));