diff options
| author | Yang, Cheng C <cheng.c.yang@intel.com> | 2019-08-08 11:29:17 +0300 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@localhost> | 2019-08-08 11:29:17 +0300 |
| commit | b62f996a1ec5043f598b91bd4353ceea5e829881 (patch) | |
| tree | 0deff4de52d214b93ff3df73722f93c68cdffff1 | |
| parent | 8ab478141ec86a5c9995b51ab931b9038ca38064 (diff) | |
| parent | 4abd7ab550bc7d79861e2319dafeb54fd2ab6dc9 (diff) | |
| download | provingground-b62f996a1ec5043f598b91bd4353ceea5e829881.tar.xz | |
Merge "Add object manager interface to SMBIOS path"
| -rw-r--r-- | services/smbios-mdrv2/include/mdrv2.hpp | 6 | ||||
| -rw-r--r-- | services/smbios-mdrv2/src/smbios_mdrv2_main.cpp | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/services/smbios-mdrv2/include/mdrv2.hpp b/services/smbios-mdrv2/include/mdrv2.hpp index bf953df..07e0628 100644 --- a/services/smbios-mdrv2/include/mdrv2.hpp +++ b/services/smbios-mdrv2/include/mdrv2.hpp @@ -38,7 +38,8 @@ namespace smbios static constexpr const char *mdrV2Path = "/xyz/openbmc_project/Smbios/MDR_V2"; constexpr const int limitEntryLen = 0xff; -class MDR_V2 : sdbusplus::xyz::openbmc_project::Smbios::server::MDR_V2 +class MDR_V2 : sdbusplus::server::object::object< + sdbusplus::xyz::openbmc_project::Smbios::server::MDR_V2> { public: MDR_V2() = delete; @@ -49,7 +50,8 @@ class MDR_V2 : sdbusplus::xyz::openbmc_project::Smbios::server::MDR_V2 ~MDR_V2() = default; MDR_V2(sdbusplus::bus::bus &bus, const char *path, sd_event *event) : - sdbusplus::xyz::openbmc_project::Smbios::server::MDR_V2(bus, path), + sdbusplus::server::object::object< + sdbusplus::xyz::openbmc_project::Smbios::server::MDR_V2>(bus, path), bus(bus), timer(event, [&](void) { agentSynchronizeData(); }) { diff --git a/services/smbios-mdrv2/src/smbios_mdrv2_main.cpp b/services/smbios-mdrv2/src/smbios_mdrv2_main.cpp index bb26ff6..7e205ee 100644 --- a/services/smbios-mdrv2/src/smbios_mdrv2_main.cpp +++ b/services/smbios-mdrv2/src/smbios_mdrv2_main.cpp @@ -26,6 +26,7 @@ int main(void) sd_event *events = nullptr; sd_event_default(&events); sdbusplus::bus::bus bus = sdbusplus::bus::new_default(); + sdbusplus::server::manager::manager objManager(bus, "/xyz/openbmc_project"); bus.attach_event(events, SD_EVENT_PRIORITY_NORMAL); bus.request_name("xyz.openbmc_project.Smbios.MDR_V2"); |