commit 794312c8ca98ba02b9ad70643c7cff862bf10629
author Lawrence Tang <lawrence.tang@arm.com> Tue Jul 05 14:46:10 2022 +0100
committer Lawrence Tang <lawrence.tang@arm.com> Tue Jul 05 14:46:10 2022 +0100
tree e4e40f127d79f5fa051a479c0b3e8cfbcf3afedd
parent 3c43f74331d9fc00539a38700e830fd13e79c680

Add untested IA32/x64 log support.

cper-parse.c

diff --git a/cper-parse.c b/cper-parse.c
index 58f8360..ffdd45f 100644
--- a/cper-parse.c
+++ b/cper-parse.c
@@ -11,6 +11,7 @@
 #include "cper-parse.h"
 #include "cper-utils.h"
 #include "sections/cper-section-generic.h"
+#include "sections/cper-section-ia32x64.h"
 
 //Private pre-definitions.
 json_object* cper_header_to_ir(EFI_COMMON_ERROR_RECORD_HEADER* header);
@@ -158,27 +159,27 @@
     char* notification_type_readable = "Unknown";
     if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeCmcGuid))
         notification_type_readable = "CMC";
-    if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeCpeGuid))
+    else if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeCpeGuid))
         notification_type_readable = "CPE";
-    if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeMceGuid))
+    else if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeMceGuid))
         notification_type_readable = "MCE";
-    if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypePcieGuid))
+    else if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypePcieGuid))
         notification_type_readable = "PCIe";
-    if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeInitGuid))
+    else if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeInitGuid))
         notification_type_readable = "INIT";
-    if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeNmiGuid))
+    else if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeNmiGuid))
         notification_type_readable = "NMI";
-    if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeBootGuid))
+    else if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeBootGuid))
         notification_type_readable = "Boot";
-    if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeDmarGuid))
+    else if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeDmarGuid))
         notification_type_readable = "DMAr";
-    if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeSeaGuid))
+    else if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeSeaGuid))
         notification_type_readable = "SEA";
-    if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeSeiGuid))
+    else if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeSeiGuid))
         notification_type_readable = "SEI";
-    if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypePeiGuid))
+    else if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypePeiGuid))
         notification_type_readable = "PEI";
-    if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeCxlGuid))
+    else if (guid_equal(&header->NotificationType, &gEfiEventNotificationTypeCxlGuid))
         notification_type_readable = "CXL Component";
     json_object_object_add(notification_type, "type", json_object_new_string(notification_type_readable));
     json_object_object_add(header_ir, "notificationType", notification_type);
@@ -308,8 +309,8 @@
     json_object* result = NULL;
     if (guid_equal(&descriptor->SectionType, &gEfiProcessorGenericErrorSectionGuid))
         result = cper_section_generic_to_ir(handle, descriptor);
-    // if (guid_equal(&descriptor->SectionType, &gEfiIa32X64ProcessorErrorSectionGuid))
-    //     result = cper_section_ia32x64_to_ir(handle);
+    if (guid_equal(&descriptor->SectionType, &gEfiIa32X64ProcessorErrorSectionGuid))
+        result = cper_section_ia32x64_to_ir(handle, descriptor);
     // //todo: Why does IPF have an overly long GUID?
     // // if (guid_equal(&descriptor->SectionType, &gEfiIpfProcessorErrorSectionGuid))
     // if (guid_equal(&descriptor->SectionType, &gEfiArmProcessorErrorSectionGuid))