Fix smbios-mdrv2 CI build
The phosphor-dbus-interface type for memorySizeInKB changed
from uint32_t to size_t.
https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-dbus-interfaces/+/41870
This updates smbios-mdrv2 with that change to fix the CI build.
The phosphor-dbus-interface name for Common::UUID changed
from uUID to uuid. This updates smbios-mdrv2 with that change
to fix the CI build.
Change-Id: I37994e7b36ea8182c01386d804ff2de1e682fdd8
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
diff --git a/src/system.cpp b/src/system.cpp
index 2f6e3e4..81c6ef5 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -27,7 +27,7 @@
namespace smbios
{
-std::string System::uUID(std::string value)
+std::string System::uuid(std::string value)
{
uint8_t* dataIn = storage;
dataIn = getSMBIOSTypePtr(dataIn, systemType);
@@ -36,29 +36,29 @@
auto systemInfo = reinterpret_cast<struct SystemInfo*>(dataIn);
std::stringstream stream;
stream << std::setfill('0') << std::hex;
- stream << std::setw(8) << systemInfo->uUID.timeLow;
+ stream << std::setw(8) << systemInfo->uuid.timeLow;
stream << "-";
- stream << std::setw(4) << systemInfo->uUID.timeMid;
+ stream << std::setw(4) << systemInfo->uuid.timeMid;
stream << "-";
- stream << std::setw(4) << systemInfo->uUID.timeHiAndVer;
+ stream << std::setw(4) << systemInfo->uuid.timeHiAndVer;
stream << "-";
- stream << std::setw(2) << static_cast<int>(systemInfo->uUID.clockSeqHi);
+ stream << std::setw(2) << static_cast<int>(systemInfo->uuid.clockSeqHi);
stream << std::setw(2)
- << static_cast<int>(systemInfo->uUID.clockSeqLow);
+ << static_cast<int>(systemInfo->uuid.clockSeqLow);
stream << "-";
- static_assert(sizeof(systemInfo->uUID.node) == 6);
- stream << std::setw(2) << static_cast<int>(systemInfo->uUID.node[0]);
- stream << std::setw(2) << static_cast<int>(systemInfo->uUID.node[1]);
- stream << std::setw(2) << static_cast<int>(systemInfo->uUID.node[2]);
- stream << std::setw(2) << static_cast<int>(systemInfo->uUID.node[3]);
- stream << std::setw(2) << static_cast<int>(systemInfo->uUID.node[4]);
- stream << std::setw(2) << static_cast<int>(systemInfo->uUID.node[5]);
+ static_assert(sizeof(systemInfo->uuid.node) == 6);
+ stream << std::setw(2) << static_cast<int>(systemInfo->uuid.node[0]);
+ stream << std::setw(2) << static_cast<int>(systemInfo->uuid.node[1]);
+ stream << std::setw(2) << static_cast<int>(systemInfo->uuid.node[2]);
+ stream << std::setw(2) << static_cast<int>(systemInfo->uuid.node[3]);
+ stream << std::setw(2) << static_cast<int>(systemInfo->uuid.node[4]);
+ stream << std::setw(2) << static_cast<int>(systemInfo->uuid.node[5]);
- return sdbusplus::xyz::openbmc_project::Common::server::UUID::uUID(
+ return sdbusplus::xyz::openbmc_project::Common::server::UUID::uuid(
stream.str());
}
- return sdbusplus::xyz::openbmc_project::Common::server::UUID::uUID(
+ return sdbusplus::xyz::openbmc_project::Common::server::UUID::uuid(
"00000000-0000-0000-0000-000000000000");
}