Revert "PEL: Create trace wrapper for peltool"
This reverts commit 2ea96f6c6c92bb585668cff7c659cdea606dfc68.
Going to go in a different direction and not build peltool in other
contexts.
Change-Id: I92fefbb3fe5249f2cc0ccf679febe5a3b3340048
diff --git a/extensions/openpower-pels/private_header.cpp b/extensions/openpower-pels/private_header.cpp
index 74d895c..31e0f61 100644
--- a/extensions/openpower-pels/private_header.cpp
+++ b/extensions/openpower-pels/private_header.cpp
@@ -19,9 +19,8 @@
#include "log_id.hpp"
#include "pel_types.hpp"
#include "pel_values.hpp"
-#include "trace.hpp"
-#include <fmt/format.h>
+#include <phosphor-logging/log.hpp>
namespace openpower
{
@@ -29,6 +28,7 @@
{
namespace pv = openpower::pels::pel_values;
+using namespace phosphor::logging;
PrivateHeader::PrivateHeader(uint16_t componentID, uint32_t obmcLogID,
uint64_t timestamp)
@@ -77,8 +77,8 @@
}
catch (const std::exception& e)
{
- trace::error(
- fmt::format("Cannot unflatten private header: {}", e.what()));
+ log<level::ERR>("Cannot unflatten private header",
+ entry("ERROR=%s", e.what()));
_valid = false;
}
}
@@ -126,22 +126,22 @@
if (header().id != static_cast<uint16_t>(SectionID::privateHeader))
{
- trace::error(fmt::format("Invalid private header section ID: {:#X}",
- header().id));
+ log<level::ERR>("Invalid private header section ID",
+ entry("ID=0x%X", header().id));
failed = true;
}
if (header().version != privateHeaderVersion)
{
- trace::error(fmt::format("Invalid private header version: {}",
- header().version));
+ log<level::ERR>("Invalid private header version",
+ entry("VERSION=0x%X", header().version));
failed = true;
}
if (_sectionCount < minSectionCount)
{
- trace::error(fmt::format("Invalid section count in private header: {}",
- _sectionCount));
+ log<level::ERR>("Invalid section count in private header",
+ entry("SECTION_COUNT=0x%X", _sectionCount));
failed = true;
}