commit 316f23d9394af9aeba71a935a45f749259ce4211
author Vernon Mauery <vernon.mauery@linux.intel.com> Mon Oct 29 13:34:26 2018 -0700
committer Tom Joseph <tomjoseph@in.ibm.com> Mon Dec 10 14:52:37 2018 +0000
tree cf2d243c8642a52a43d7faad0425bf2df35861e7
parent 4fe7efe8855f28e73278baa286eb45e221a15a1c

ipmid: host-cmd-manager to use default event source for timers

The sdbusplus/timer.hpp class can be passed an event, but by default, it
just uses the default system event queue. This updates the
host-cmd-manager Manager class to use the defaults.

Tested-by: Send the heartbeat command with the host powered off and
           watch for a timeout message:

    dbus-send --print-reply --system \
    --dest=xyz.openbmc_project.Ipmi.Host \
    /xyz/openbmc_project/control/host0 \
    xyz.openbmc_project.Control.Host.Execute \
    string:"xyz.openbmc_project.Control.Host.Command.Heartbeat"

    Watch the log (journalctl -f):

    Nov 27 00:34:52 wolfpass ipmid[1255]: Pushing cmd on to queue
    Nov 27 00:34:52 wolfpass ipmid[1255]: Pushing cmd on to queue
    Nov 27 00:34:52 wolfpass ipmid[1255]: Asserting SMS Attention
    Nov 27 00:34:52 wolfpass ipmid[1255]: SMS Attention asserted
    Nov 27 00:35:23 wolfpass ipmid[1255]: Host control timeout hit!

Change-Id: I904d34b67050723a9c7e405bda4e02f1a9cb4dbd
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>

host-cmd-manager.cpp

diff --git a/host-cmd-manager.cpp b/host-cmd-manager.cpp
index 28bcb70..0a61e63 100644
--- a/host-cmd-manager.cpp
+++ b/host-cmd-manager.cpp
@@ -35,8 +35,8 @@
 namespace sdbusRule = sdbusplus::bus::match::rules;
 namespace variant_ns = sdbusplus::message::variant_ns;
 
-Manager::Manager(sdbusplus::bus::bus& bus, sd_event* event) :
-    bus(bus), timer(event, std::bind(&Manager::hostTimeout, this)),
+Manager::Manager(sdbusplus::bus::bus& bus) :
+    bus(bus), timer(std::bind(&Manager::hostTimeout, this)),
     hostTransitionMatch(
         bus,
         sdbusRule::propertiesChanged(HOST_STATE_PATH, HOST_STATE_INTERFACE),

host-cmd-manager.hpp

diff --git a/host-cmd-manager.hpp b/host-cmd-manager.hpp
index 9a5891c..6b56122 100644
--- a/host-cmd-manager.hpp
+++ b/host-cmd-manager.hpp
@@ -32,7 +32,7 @@
      *  @param[in] bus   - dbus handler
      *  @param[in] event - pointer to sd_event
      */
-    Manager(sdbusplus::bus::bus& bus, sd_event* event);
+    explicit Manager(sdbusplus::bus::bus& bus);
 
     /** @brief  Extracts the next entry in the queue and returns
      *          Command and data part of it.

ipmid.cpp

diff --git a/ipmid.cpp b/ipmid.cpp
index cb92175..11d6796 100644
--- a/ipmid.cpp
+++ b/ipmid.cpp
@@ -656,8 +656,7 @@
     sdbusp = std::make_unique<sdbusplus::bus::bus>(bus);
     sdbusp->request_name("xyz.openbmc_project.Ipmi.Host");
 
-    cmdManager =
-        std::make_unique<phosphor::host::command::Manager>(*sdbusp, events);
+    cmdManager = std::make_unique<phosphor::host::command::Manager>(*sdbusp);
 
     // Activate OemRouter.
     oem::mutableRouter()->activate();