recipes-phosphor/sensors/dbus-sensors/0017-nvmesensor-fix-compile-issue-after-mearging-cleaning.patch

From 8daedd60dc46d8bccacd6984cdf8c7346a9ae5d8 Mon Sep 17 00:00:00 2001
From: Jinliang Wang <jinliangw@google.com>
Date: Thu, 7 Sep 2023 00:56:14 -0700
Subject: [PATCH] nvmesensor: fix compile issue after merging cleaning command

Signed-off-by: Jinliang Wang <jinliangw@google.com>
---
 src/NVMeController.hpp            | 4 ++--
 src/NVMeDrive.hpp                 | 2 +-
 {include => src}/NVMeError.hpp    | 0
 {include => src}/NVMeProgress.hpp | 0
 src/NVMeStorage.hpp               | 2 +-
 src/NVMeSubsys.cpp                | 3 ++-
 {include => src}/NVMeVolume.hpp   | 0
 7 files changed, 6 insertions(+), 5 deletions(-)
 rename {include => src}/NVMeError.hpp (100%)
 rename {include => src}/NVMeProgress.hpp (100%)
 rename {include => src}/NVMeVolume.hpp (100%)

diff --git a/src/NVMeController.hpp b/src/NVMeController.hpp
index 2036aa1..54d03eb 100644
--- a/src/NVMeController.hpp
+++ b/src/NVMeController.hpp
@@ -15,9 +15,9 @@
 #include <utility>
 
 using SoftwareVersion =
-    sdbusplus::server::xyz::openbmc_project::software::Version;
+    sdbusplus::xyz::openbmc_project::Software::server::Version;
 using SoftwareExtVersion =
-    sdbusplus::server::xyz::openbmc_project::software::ExtendedVersion;
+    sdbusplus::xyz::openbmc_project::Software::server::ExtendedVersion;
 
 class NVMeControllerPlugin;
 class NVMeSubsystem;
diff --git a/src/NVMeDrive.hpp b/src/NVMeDrive.hpp
index 40f7588..708a6e9 100644
--- a/src/NVMeDrive.hpp
+++ b/src/NVMeDrive.hpp
@@ -17,7 +17,7 @@ using DriveErase =
 using EraseAction = sdbusplus::xyz::openbmc_project::Inventory::Item::server::
     DriveErase::EraseAction;
 using Asset =
-    sdbusplus::server::xyz::openbmc_project::inventory::decorator::Asset;
+    sdbusplus::xyz::openbmc_project::Inventory::Decorator::server::Asset;
 
 class NVMeSubsystem;
 
diff --git a/include/NVMeError.hpp b/src/NVMeError.hpp
similarity index 100%
rename from include/NVMeError.hpp
rename to src/NVMeError.hpp
diff --git a/include/NVMeProgress.hpp b/src/NVMeProgress.hpp
similarity index 100%
rename from include/NVMeProgress.hpp
rename to src/NVMeProgress.hpp
diff --git a/src/NVMeStorage.hpp b/src/NVMeStorage.hpp
index 761aefe..5936d6c 100644
--- a/src/NVMeStorage.hpp
+++ b/src/NVMeStorage.hpp
@@ -13,7 +13,7 @@
 using StorageBase =
     sdbusplus::xyz::openbmc_project::Inventory::Item::server::Storage;
 using RelPerf =
-    sdbusplus::common::xyz::openbmc_project::nvme::Storage::RelativePerformance;
+    sdbusplus::xyz::openbmc_project::Nvme::server::Storage::RelativePerformance;
 
 struct LBAFormat
 {
diff --git a/src/NVMeSubsys.cpp b/src/NVMeSubsys.cpp
index 97a17fa..32f0304 100644
--- a/src/NVMeSubsys.cpp
+++ b/src/NVMeSubsys.cpp
@@ -1035,7 +1035,8 @@ void NVMeSubsystem::querySupportedFormats()
 
         nvme_id_ns& id = *reinterpret_cast<nvme_id_ns*>(data.data());
 
-        size_t nlbaf = id.nlbaf;
+        // nlbaf is 0’s based
+        size_t nlbaf = id.nlbaf + 1;
         if (nlbaf > 64)
         {
             std::cerr << self->name << ": Bad nlbaf " << nlbaf << "\n";
diff --git a/include/NVMeVolume.hpp b/src/NVMeVolume.hpp
similarity index 100%
rename from include/NVMeVolume.hpp
rename to src/NVMeVolume.hpp
-- 
2.42.0.283.g2d96d420d3-goog