phosphor-debug-collector: Rename CrashDump log event
The CrashDumpLogCreated signal is specific to a previous platform,
while CrashdumpComplete is now upstream in Intel Crashdump code
and is compatible with the previous platform as well as new Intel
platforms.
Fusion-Link:
platform5: fusion2/ceafc844-f4d4-352b-94f4-03ab2f6387bf
(failed but not related to this change)
platform11: fusion2/264961a3-f243-38d2-bdc7-19b654803d73
platform15: fusion2/260162f4-d863-3bdb-b8a8-ab1cc5442dc0
Tested: Compile
Google-Bug-Id: 355195841
Change-Id: I30476bd8ba0967000b8f44758b7e293bb7692496
Signed-off-by: Alex Lai <alexlai@google.com>
diff --git a/recipes-phosphor/dump/phosphor-debug-collector/0001-Add-CPER-Log-and-Crashdump-support-in-FaultLog.patch b/recipes-phosphor/dump/phosphor-debug-collector/0001-Add-CPER-Log-and-Crashdump-support-in-FaultLog.patch
index cdd5e37..fa00ad3 100644
--- a/recipes-phosphor/dump/phosphor-debug-collector/0001-Add-CPER-Log-and-Crashdump-support-in-FaultLog.patch
+++ b/recipes-phosphor/dump/phosphor-debug-collector/0001-Add-CPER-Log-and-Crashdump-support-in-FaultLog.patch
@@ -1,4 +1,4 @@
-From aad7501b22745f29e045d0be847ef5573b57c509 Mon Sep 17 00:00:00 2001
+From 662b389cefd7794af69663516c87450099f2fb85 Mon Sep 17 00:00:00 2001
From: Claire Weinan <cweinan@google.com>
Date: Tue, 26 Jul 2022 10:50:34 -0700
Subject: [PATCH 1/2] Add CPER Log and Crashdump support in FaultLog
@@ -90,7 +90,7 @@
/** @brief sdbusplus DBus bus connection. */
sdbusplus::bus_t& bus;
diff --git a/dump_manager_faultlog.cpp b/dump_manager_faultlog.cpp
-index 8e0967e..6e8f3fa 100644
+index 8e0967e..78a0fe3 100644
--- a/dump_manager_faultlog.cpp
+++ b/dump_manager_faultlog.cpp
@@ -12,6 +12,7 @@
@@ -223,7 +223,7 @@
+ crashdumpMatch = std::make_unique<sdbusplus::bus::match_t>(
+ bus,
+ "type='signal',interface='com.intel.crashdump',member='"
-+ "CrashdumpLogCreated',path_namespace='/com/intel/crashdump'",
++ "CrashdumpComplete',path_namespace='/com/intel/crashdump'",
+
+ [this](sdbusplus::message_t& msg) {
+ if (msg.is_method_error())
@@ -821,5 +821,5 @@
# System dump options
--
-2.46.0.184.g6999bdac58-goog
+2.47.1.613.gc27f4b7a9f-goog
diff --git a/recipes-phosphor/dump/phosphor-debug-collector/0002-phosphor-debug-collector-agentless-AMD-Crashdump.patch b/recipes-phosphor/dump/phosphor-debug-collector/0002-phosphor-debug-collector-agentless-AMD-Crashdump.patch
index 27f6931..cbdd062 100644
--- a/recipes-phosphor/dump/phosphor-debug-collector/0002-phosphor-debug-collector-agentless-AMD-Crashdump.patch
+++ b/recipes-phosphor/dump/phosphor-debug-collector/0002-phosphor-debug-collector-agentless-AMD-Crashdump.patch
@@ -1,4 +1,4 @@
-From 5ad83da0f4f855c9c8ce1efdd8efb41d1fcd5bdf Mon Sep 17 00:00:00 2001
+From 892c552b2866666400a2ddcaf804468bdeff304d Mon Sep 17 00:00:00 2001
From: Claire Weinan <cweinan@google.com>
Date: Mon, 26 Sep 2022 14:22:43 -0700
Subject: [PATCH 2/2] phosphor-debug-collector: agentless: AMD Crashdump
@@ -163,7 +163,7 @@
4 files changed, 206 insertions(+), 30 deletions(-)
diff --git a/dump_manager_faultlog.cpp b/dump_manager_faultlog.cpp
-index 6e8f3fa..e9f7aab 100644
+index 78a0fe3..c4e80be 100644
--- a/dump_manager_faultlog.cpp
+++ b/dump_manager_faultlog.cpp
@@ -130,56 +130,189 @@ sdbusplus::message::object_path
@@ -241,7 +241,7 @@
- crashdumpMatch = std::make_unique<sdbusplus::bus::match_t>(
- bus,
- "type='signal',interface='com.intel.crashdump',member='"
-- "CrashdumpLogCreated',path_namespace='/com/intel/crashdump'",
+- "CrashdumpComplete',path_namespace='/com/intel/crashdump'",
+ registerCrashdumpAddedMatch();
+ registerCrashdumpRemovedMatch();
+ registerCrashdumpDeleteAllMatch();
@@ -267,7 +267,7 @@
+ {
+ crashdumpAddedMatchString =
+ "type='signal',interface='com.intel.crashdump',member='"
-+ "CrashdumpLogCreated',path_namespace='/com/intel/crashdump'";
++ "CrashdumpComplete',path_namespace='/com/intel/crashdump'";
+ }
+ else if (std::string(CRASHDUMP_FORMAT) == "AMD")
+ {
@@ -481,5 +481,5 @@
# System dump options
--
-2.46.0.184.g6999bdac58-goog
+2.47.1.613.gc27f4b7a9f-goog
