commit f10068d397f4613b526394afbae245087caacb9d
author Matt Spinler <spinler@us.ibm.com> Wed Dec 02 10:44:08 2020 -0600
committer Matt Spinler <spinler@us.ibm.com> Wed Dec 09 16:34:55 2020 +0000
tree 0fa655733e9651ca02110826aa19e9d483da31f6
parent cea3f89ba81f3ccc37f8a6ada1024a43429156b9

PEL: Use different property for host running

The new method to tell if the hypervisor is running is to use the
BootProgress property on the xyz.openbmc_project.State.Boot.Progress
interface.  Use that instead in the code that will send PELs up to the
hypervisor.

Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I02c30716f7223706c7ae2b4a6c67704097cf5d1f

extensions/openpower-pels/data_interface.cpp

diff --git a/extensions/openpower-pels/data_interface.cpp b/extensions/openpower-pels/data_interface.cpp
index de6591a..518df8f 100644
--- a/extensions/openpower-pels/data_interface.cpp
+++ b/extensions/openpower-pels/data_interface.cpp
@@ -20,7 +20,7 @@
 #include "util.hpp"
 
 #include <fstream>
-#include <xyz/openbmc_project/State/OperatingSystem/Status/server.hpp>
+#include <xyz/openbmc_project/State/Boot/Progress/server.hpp>
 
 namespace openpower
 {
@@ -54,7 +54,7 @@
 constexpr auto dbusProperty = "org.freedesktop.DBus.Properties";
 constexpr auto objectMapper = "xyz.openbmc_project.ObjectMapper";
 constexpr auto invAsset = "xyz.openbmc_project.Inventory.Decorator.Asset";
-constexpr auto osStatus = "xyz.openbmc_project.State.OperatingSystem.Status";
+constexpr auto bootProgress = "xyz.openbmc_project.State.Boot.Progress";
 constexpr auto pldmRequester = "xyz.openbmc_project.PLDM.Requester";
 constexpr auto enable = "xyz.openbmc_project.Object.Enable";
 constexpr auto bmcState = "xyz.openbmc_project.State.BMC";
@@ -71,7 +71,7 @@
 constexpr auto ledGroup = "xyz.openbmc_project.Led.Group";
 } // namespace interface
 
-using namespace sdbusplus::xyz::openbmc_project::State::OperatingSystem::server;
+using namespace sdbusplus::xyz::openbmc_project::State::Boot::server;
 using sdbusplus::exception::SdBusError;
 
 DataInterface::DataInterface(sdbusplus::bus::bus& bus) : _bus(bus)
@@ -98,15 +98,16 @@
             }
         }));
 
-    // Watch the OperatingSystemState property
+    // Watch the BootProgress property
     _properties.emplace_back(std::make_unique<PropertyWatcher<DataInterface>>(
-        bus, object_path::hostState, interface::osStatus,
-        "OperatingSystemState", *this, [this](const auto& value) {
-            auto status =
-                Status::convertOSStatusFromString(std::get<std::string>(value));
+        bus, object_path::hostState, interface::bootProgress, "BootProgress",
+        *this, [this](const auto& value) {
+            auto status = Progress::convertProgressStagesFromString(
+                std::get<std::string>(value));
 
-            if ((status == Status::OSStatus::BootComplete) ||
-                (status == Status::OSStatus::Standby))
+            if ((status == Progress::ProgressStages::SystemInitComplete) ||
+                (status == Progress::ProgressStages::OSStart) ||
+                (status == Progress::ProgressStages::OSRunning))
             {
                 setHostUp(true);
             }