commit 83409573d6f6303e717382d0428c55eda8b571e1
author George Liu <liuxiwei@inspur.com> Tue Dec 24 18:42:54 2019 +0800
committer Deepak Kodihalli <dkodihal@in.ibm.com> Fri Jan 17 08:01:44 2020 -0600
tree 26c0cd17de7972884f0eb15fed68ff0be45de346
parent 2da1bfea011a5419e4bf0a5bbc62fc51671b96e1

pldm: Moving utils function into the common directory

Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I4fbd0da4bc6f27e9a9ed711962bd8737d8b55ebf

oem/ibm/libpldmresponder/file_io.cpp

diff --git a/oem/ibm/libpldmresponder/file_io.cpp b/oem/ibm/libpldmresponder/file_io.cpp
index 177fe3f..c35084c 100644
--- a/oem/ibm/libpldmresponder/file_io.cpp
+++ b/oem/ibm/libpldmresponder/file_io.cpp
@@ -4,7 +4,7 @@
 
 #include "file_io_by_type.hpp"
 #include "file_table.hpp"
-#include "libpldmresponder/utils.hpp"
+#include "utils.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
 #include <fcntl.h>
@@ -75,7 +75,7 @@
         return rc;
     }
 
-    utils::CustomFD xdmaFd(dmaFd);
+    pldm::utils::CustomFD xdmaFd(dmaFd);
 
     void* vgaMem;
     vgaMem = mmap(nullptr, pageAlignedLength, upstream ? PROT_WRITE : PROT_READ,

oem/ibm/libpldmresponder/file_io.hpp

diff --git a/oem/ibm/libpldmresponder/file_io.hpp b/oem/ibm/libpldmresponder/file_io.hpp
index a22a8c8..3a504bf 100644
--- a/oem/ibm/libpldmresponder/file_io.hpp
+++ b/oem/ibm/libpldmresponder/file_io.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "handler.hpp"
-#include "libpldmresponder/utils.hpp"
+#include "utils.hpp"
 
 #include <fcntl.h>
 #include <stdint.h>
@@ -107,7 +107,7 @@
                                    responsePtr);
         return response;
     }
-    utils::CustomFD fd(file);
+    pldm::utils::CustomFD fd(file);
 
     while (length > dma::maxSize)
     {

oem/ibm/libpldmresponder/file_io_by_type.cpp

diff --git a/oem/ibm/libpldmresponder/file_io_by_type.cpp b/oem/ibm/libpldmresponder/file_io_by_type.cpp
index 7d001b9..e076253 100644
--- a/oem/ibm/libpldmresponder/file_io_by_type.cpp
+++ b/oem/ibm/libpldmresponder/file_io_by_type.cpp
@@ -4,7 +4,7 @@
 
 #include "file_io_type_lid.hpp"
 #include "file_io_type_pel.hpp"
-#include "libpldmresponder/utils.hpp"
+#include "utils.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
 #include <stdint.h>

oem/ibm/libpldmresponder/file_io_type_pel.cpp

diff --git a/oem/ibm/libpldmresponder/file_io_type_pel.cpp b/oem/ibm/libpldmresponder/file_io_type_pel.cpp
index 8029b47..ce9202a 100644
--- a/oem/ibm/libpldmresponder/file_io_type_pel.cpp
+++ b/oem/ibm/libpldmresponder/file_io_type_pel.cpp
@@ -2,7 +2,7 @@
 
 #include "file_io_type_pel.hpp"
 
-#include "libpldmresponder/utils.hpp"
+#include "utils.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
 #include <stdint.h>
@@ -34,7 +34,7 @@
 
     try
     {
-        auto service = getService(bus, logObjPath, logInterface);
+        auto service = pldm::utils::getService(bus, logObjPath, logInterface);
         auto method = bus.new_method_call(service.c_str(), logObjPath,
                                           logInterface, "GetPEL");
         method.append(fileHandle);
@@ -62,7 +62,7 @@
 
     try
     {
-        auto service = getService(bus, logObjPath, logInterface);
+        auto service = pldm::utils::getService(bus, logObjPath, logInterface);
         auto method = bus.new_method_call(service.c_str(), logObjPath,
                                           logInterface, "GetPEL");
         method.append(fileHandle);
@@ -149,7 +149,7 @@
 
     try
     {
-        auto service = getService(bus, logObjPath, logInterface);
+        auto service = pldm::utils::getService(bus, logObjPath, logInterface);
         auto method = bus.new_method_call(service.c_str(), logObjPath,
                                           logInterface, "HostAck");
         method.append(fileHandle);
@@ -173,7 +173,7 @@
 
     try
     {
-        auto service = getService(bus, logObjPath, logInterface);
+        auto service = pldm::utils::getService(bus, logObjPath, logInterface);
         using namespace sdbusplus::xyz::openbmc_project::Logging::server;
         std::map<std::string, std::string> addlData{};
         addlData.emplace("RAWPEL", std::move(pelFileName));