Revert "oem-ibm : Support for VPD record PSPD via file I/O with offset"
This reverts commit 397019d65ec07617f0a711f5718895174fb0f504.
The parent commit on which this relies is broken.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: Iab26f6d75c29d8902f9c9dac61731ab9a4c17c5d
diff --git a/oem/ibm/libpldmresponder/file_io_type_vpd.cpp b/oem/ibm/libpldmresponder/file_io_type_vpd.cpp
index 0614ccc..07530a8 100644
--- a/oem/ibm/libpldmresponder/file_io_type_vpd.cpp
+++ b/oem/ibm/libpldmresponder/file_io_type_vpd.cpp
@@ -63,8 +63,8 @@
fs::perms::others_read | fs::perms::owner_write);
}
- std::ofstream keywrdFile(keywrdFilePath);
- auto fd = open(keywrdFilePath, std::ios::out | std::ofstream::binary);
+ std::ofstream keywrdFile("vpdKeywrd.bin");
+ keywrdFile.open(keywrdFilePath, std::ios::out | std::ofstream::binary);
if (!keywrdFile)
{
std::cerr << "VPD keyword file open error: " << keywrdFilePath
@@ -74,26 +74,6 @@
pldm::PelSeverity::ERROR);
return PLDM_ERROR;
}
-
- if (offset > keywrdSize)
- {
- std::cerr << "Offset exceeds file size, OFFSET=" << offset
- << " FILE_SIZE=" << keywrdSize << std::endl;
- return PLDM_DATA_OUT_OF_RANGE;
- }
-
- // length of keyword data should be same as keyword data size in dbus object
- length = static_cast<uint32_t>(keywrdSize) - offset;
-
- auto returnCode = lseek(fd, offset, SEEK_SET);
- if (returnCode == -1)
- {
- std::cerr
- << "Could not find keyword data at given offset. File Seek failed"
- << std::endl;
- return PLDM_ERROR;
- }
-
keywrdFile.write((const char*)std::get<std::vector<byte>>(keywrd).data(),
keywrdSize);
if (keywrdFile.bad())
@@ -103,6 +83,9 @@
}
keywrdFile.close();
+ // length of keyword data should be same as keyword data size in dbus object
+ length = (uint32_t)keywrdSize;
+
auto rc = readFile(keywrdFilePath, offset, keywrdSize, response);
fs::remove(keywrdFilePath);
if (rc)