OvmfPkg: replace old EFI_D_ debug levels with new DEBUG_ ones

[mirror_edk2.git] / OvmfPkg / SmmControl2Dxe / SmmControl2Dxe.c

diff --git a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c b/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c
index e1cd3d02ac36f56d02dc2cf1226162c8a8f9baba..9547c202880ff88b905b99bd903b2fe7e682b0fd 100644 (file)
--- a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c
+++ b/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c
@@ -15,13 +15,7 @@
   Copyright (C) 2013, 2015, Red Hat, Inc.<BR>\r
   Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
 \r
-  This program and the accompanying materials are licensed and made available\r
-  under the terms and conditions of the BSD License which accompanies this\r
-  distribution. The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT\r
-  WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -210,7 +204,7 @@ SmmControl2DxeEntryPoint (
   //\r
   SmiEnableVal = IoRead32 (mSmiEnable);\r
   if ((SmiEnableVal & ICH9_SMI_EN_APMC_EN) != 0) {\r
-    DEBUG ((EFI_D_ERROR, "%a: this Q35 implementation lacks SMI\n",\r
+    DEBUG ((DEBUG_ERROR, "%a: this Q35 implementation lacks SMI\n",\r
       __FUNCTION__));\r
     goto FatalError;\r
   }\r
@@ -234,7 +228,7 @@ SmmControl2DxeEntryPoint (
   //\r
   IoWrite32 (mSmiEnable, SmiEnableVal & ~(UINT32)ICH9_SMI_EN_GBL_SMI_EN);\r
   if (IoRead32 (mSmiEnable) != SmiEnableVal) {\r
-    DEBUG ((EFI_D_ERROR, "%a: failed to lock down GBL_SMI_EN\n",\r
+    DEBUG ((DEBUG_ERROR, "%a: failed to lock down GBL_SMI_EN\n",\r
       __FUNCTION__));\r
     goto FatalError;\r
   }\r
@@ -256,14 +250,14 @@ SmmControl2DxeEntryPoint (
                     OnS3SaveStateInstalled, NULL /* Context */,\r
                     &mS3SaveStateInstalled);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "%a: CreateEvent: %r\n", __FUNCTION__, Status));\r
+      DEBUG ((DEBUG_ERROR, "%a: CreateEvent: %r\n", __FUNCTION__, Status));\r
       goto FatalError;\r
     }\r
 \r
     Status = gBS->RegisterProtocolNotify (&gEfiS3SaveStateProtocolGuid,\r
                     mS3SaveStateInstalled, &Registration);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "%a: RegisterProtocolNotify: %r\n", __FUNCTION__,\r
+      DEBUG ((DEBUG_ERROR, "%a: RegisterProtocolNotify: %r\n", __FUNCTION__,\r
         Status));\r
       goto ReleaseEvent;\r
     }\r
@@ -273,7 +267,7 @@ SmmControl2DxeEntryPoint (
     //\r
     Status = gBS->SignalEvent (mS3SaveStateInstalled);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "%a: SignalEvent: %r\n", __FUNCTION__, Status));\r
+      DEBUG ((DEBUG_ERROR, "%a: SignalEvent: %r\n", __FUNCTION__, Status));\r
       goto ReleaseEvent;\r
     }\r
   }\r
@@ -286,7 +280,7 @@ SmmControl2DxeEntryPoint (
                   &gEfiSmmControl2ProtocolGuid, &mControl2,\r
                   NULL);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "%a: InstallMultipleProtocolInterfaces: %r\n",\r
+    DEBUG ((DEBUG_ERROR, "%a: InstallMultipleProtocolInterfaces: %r\n",\r
       __FUNCTION__, Status));\r
     goto ReleaseEvent;\r
   }\r
@@ -352,7 +346,7 @@ OnS3SaveStateInstalled (
                           &SmiEnAndMask\r
                           );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "%a: EFI_BOOT_SCRIPT_IO_READ_WRITE_OPCODE: %r\n",\r
+    DEBUG ((DEBUG_ERROR, "%a: EFI_BOOT_SCRIPT_IO_READ_WRITE_OPCODE: %r\n",\r
       __FUNCTION__, Status));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
@@ -371,7 +365,7 @@ OnS3SaveStateInstalled (
                           &GenPmCon1AndMask\r
                           );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR,\r
+    DEBUG ((DEBUG_ERROR,\r
       "%a: EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE_OPCODE: %r\n", __FUNCTION__,\r
       Status));\r
     ASSERT (FALSE);\r