diff options
Diffstat (limited to 'selutility.cpp')
| -rw-r--r-- | selutility.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/selutility.cpp b/selutility.cpp index 97c2b2b..cd3b6a6 100644 --- a/selutility.cpp +++ b/selutility.cpp @@ -58,8 +58,7 @@ GetSELEntryResponse elog<InternalFailure>(); } - record.recordID = static_cast<uint16_t>( - sdbusplus::message::variant_ns::get<uint32_t>(iterId->second)); + record.recordID = static_cast<uint16_t>(std::get<uint32_t>(iterId->second)); // Read Timestamp from the log entry. static constexpr auto propTimeStamp = "Timestamp"; @@ -71,7 +70,7 @@ GetSELEntryResponse } std::chrono::milliseconds chronoTimeStamp( - sdbusplus::message::variant_ns::get<uint64_t>(iterTimeStamp->second)); + std::get<uint64_t>(iterTimeStamp->second)); record.timeStamp = static_cast<uint32_t>( std::chrono::duration_cast<std::chrono::seconds>(chronoTimeStamp) .count()); @@ -100,7 +99,7 @@ GetSELEntryResponse static constexpr auto deassertEvent = 0x80; // Evaluate if the event is assertion or deassertion event - if (sdbusplus::message::variant_ns::get<bool>(iterResolved->second)) + if (std::get<bool>(iterResolved->second)) { record.eventType = deassertEvent | iter->second.eventReadingType; } @@ -118,8 +117,9 @@ GetSELEntryResponse convertLogEntrytoSEL(const std::string& objPath) { sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()}; - static constexpr auto assocIntf = "org.openbmc.Associations"; - static constexpr auto assocProp = "associations"; + static constexpr auto assocIntf = + "xyz.openbmc_project.Association.Definitions"; + static constexpr auto assocProp = "Associations"; auto service = ipmi::getService(bus, assocIntf, objPath); @@ -139,10 +139,10 @@ GetSELEntryResponse convertLogEntrytoSEL(const std::string& objPath) using AssociationList = std::vector<std::tuple<std::string, std::string, std::string>>; - sdbusplus::message::variant<AssociationList> list; + std::variant<AssociationList> list; reply.read(list); - auto& assocs = sdbusplus::message::variant_ns::get<AssociationList>(list); + auto& assocs = std::get<AssociationList>(list); /* * Check if the log entry has any callout associations, if there is a @@ -201,11 +201,10 @@ std::chrono::seconds getEntryTimeStamp(const std::string& objPath) elog<InternalFailure>(); } - sdbusplus::message::variant<uint64_t> timeStamp; + std::variant<uint64_t> timeStamp; reply.read(timeStamp); - std::chrono::milliseconds chronoTimeStamp( - sdbusplus::message::variant_ns::get<uint64_t>(timeStamp)); + std::chrono::milliseconds chronoTimeStamp(std::get<uint64_t>(timeStamp)); return std::chrono::duration_cast<std::chrono::seconds>(chronoTimeStamp); } |
