Update video card preference policy, together with some memory leaks in Generic BDS...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2234 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h b/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h
index ed52085a176d4256af334501938094e13580c2c0..7ec022262023067405cc3b385eb743a0518f5c5f 100644 (file)
--- a/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h
+++ b/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h
@@ -246,6 +246,17 @@ BdsLibUnpackDevicePath (
   IN EFI_DEVICE_PATH_PROTOCOL  *DevPath\r
   );\r
 \r
   IN EFI_DEVICE_PATH_PROTOCOL  *DevPath\r
   );\r
 \r

+VOID\r
+BdsLibSafeFreePool (\r
+  IN  VOID             *Buffer\r
+  );\r
+\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+BdsLibDelPartMatchInstance (\r
+  IN     EFI_DEVICE_PATH_PROTOCOL  *Multi,\r
+  IN     EFI_DEVICE_PATH_PROTOCOL  *Single\r
+  );\r
+\r

 BOOLEAN\r
 BdsLibMatchDevicePaths (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *Multi,\r
 BOOLEAN\r
 BdsLibMatchDevicePaths (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *Multi,\r

diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c
index 721d74363a077370195054f527e6d9de9544cd77..6c9097f142eb963ee2e1df3b763822f6157b2090 100644 (file)
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c
@@ -19,6 +19,30 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

+BOOLEAN\r
+IsNvNeed (\r
+  IN CHAR16 *ConVarName\r
+  )\r
+{\r
+  CHAR16 *Ptr;\r
+  \r
+  Ptr = ConVarName;\r
+  \r
+  //\r
+  // If the variable includes "Dev" at last, we consider\r
+  // it does not support NV attribute.\r
+  //\r
+  while (*Ptr) {\r
+    Ptr++;\r
+  }\r
+  \r
+  if ((*(Ptr - 3) == 'D') && (*(Ptr - 2) == 'e') && (*(Ptr - 1) == 'v')) {\r
+    return FALSE;\r
+  } else {\r
+    return TRUE;\r
+  }\r
+}\r
+\r

 EFI_STATUS\r
 BdsLibUpdateConsoleVariable (\r
   IN  CHAR16                    *ConVarName,\r
 EFI_STATUS\r
 BdsLibUpdateConsoleVariable (\r
   IN  CHAR16                    *ConVarName,\r


@@ -56,12 +80,12 @@ Returns:
   EFI_STATUS                Status;\r
   EFI_DEVICE_PATH_PROTOCOL  *VarConsole;\r
   UINTN                     DevicePathSize;\r
   EFI_STATUS                Status;\r
   EFI_DEVICE_PATH_PROTOCOL  *VarConsole;\r
   UINTN                     DevicePathSize;\r

-  EFI_DEVICE_PATH_PROTOCOL  *Instance;\r

   EFI_DEVICE_PATH_PROTOCOL  *NewDevicePath;\r
   EFI_DEVICE_PATH_PROTOCOL  *NewDevicePath;\r

+  EFI_DEVICE_PATH_PROTOCOL  *TempNewDevicePath;\r
+  UINT32                    Attributes;\r

 \r
   VarConsole      = NULL;\r
   DevicePathSize  = 0;\r
 \r
   VarConsole      = NULL;\r
   DevicePathSize  = 0;\r

-  NewDevicePath   = NULL;\r

   Status          = EFI_UNSUPPORTED;\r
 \r
   //\r
   Status          = EFI_UNSUPPORTED;\r
 \r
   //\r


@@ -79,73 +103,70 @@ Returns:
                 &gEfiGlobalVariableGuid,\r
                 &DevicePathSize\r
                 );\r
                 &gEfiGlobalVariableGuid,\r
                 &DevicePathSize\r
                 );\r

-\r
+                \r
+  //\r
+  // Initialize NewDevicePath\r
+  //\r
+  NewDevicePath  = VarConsole;\r
+  \r
+  //\r
+  // If ExclusiveDevicePath is even the part of the instance in VarConsole, delete it.\r
+  // In the end, NewDevicePath is the final device path.\r
+  //\r

   if (ExclusiveDevicePath != NULL && VarConsole != NULL) {\r
   if (ExclusiveDevicePath != NULL && VarConsole != NULL) {\r

-    if (BdsLibMatchDevicePaths (VarConsole, ExclusiveDevicePath)) {\r
-\r
-      Instance = GetNextDevicePathInstance (&VarConsole, &DevicePathSize);\r
-\r
-      while (VarConsole != NULL) {\r
-        if (CompareMem (\r
-              Instance,\r
-              ExclusiveDevicePath,\r
-              DevicePathSize - sizeof (EFI_DEVICE_PATH_PROTOCOL)\r
-              ) == 0) {\r
-          //\r
-          // Remove the match part\r
-          //\r
-          NewDevicePath = AppendDevicePathInstance (NewDevicePath, VarConsole);\r
-          break;\r
-        } else {\r
-          //\r
-          // Continue the next instance\r
-          //\r
-          NewDevicePath = AppendDevicePathInstance (NewDevicePath, Instance);\r
-        }\r
-\r
-        Instance = GetNextDevicePathInstance (&VarConsole, &DevicePathSize);\r
-      }\r
-      //\r
-      // Reset the console variable with new device path\r
-      //\r
-      gRT->SetVariable (\r
-            ConVarName,\r
-            &gEfiGlobalVariableGuid,\r
-            EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
-            GetDevicePathSize (NewDevicePath),\r
-            NewDevicePath\r
-            );\r
-    }\r
+      NewDevicePath = BdsLibDelPartMatchInstance (VarConsole, ExclusiveDevicePath);\r

   }\r
   //\r
   }\r
   //\r

-  // Try to append customized device path\r
+  // Try to append customized device path to NewDevicePath.\r

   //\r
   //\r

-  VarConsole = BdsLibGetVariableAndSize (\r
-                ConVarName,\r
-                &gEfiGlobalVariableGuid,\r
-                &DevicePathSize\r
-                );\r
-\r

   if (CustomizedConDevicePath != NULL) {\r
   if (CustomizedConDevicePath != NULL) {\r

-    if (!BdsLibMatchDevicePaths (VarConsole, CustomizedConDevicePath)) {\r
+    if (!BdsLibMatchDevicePaths (NewDevicePath, CustomizedConDevicePath)) {\r

       //\r
       //\r

-      // In the first check, the default console variable will be null,\r
-      // just append current customized device path\r
+      // Check if there is part of CustomizedConDevicePath in NewDevicePath, delete it.\r

       //\r
       //\r

-      VarConsole = AppendDevicePathInstance (VarConsole, CustomizedConDevicePath);\r
-\r
+      NewDevicePath = BdsLibDelPartMatchInstance (NewDevicePath, CustomizedConDevicePath);\r

       //\r
       //\r

-      // Update the variable of the default console\r
+      // In the first check, the default console variable will be null,\r
+      // just append current customized device path\r

       //\r
       //\r

-      gRT->SetVariable (\r
-            ConVarName,\r
-            &gEfiGlobalVariableGuid,\r
-            EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
-            GetDevicePathSize (VarConsole),\r
-            VarConsole\r
-            );\r
+      TempNewDevicePath = NewDevicePath;\r
+      NewDevicePath = AppendDevicePathInstance (NewDevicePath, CustomizedConDevicePath);\r
+      BdsLibSafeFreePool(TempNewDevicePath);\r

     }\r
   }\r
     }\r
   }\r

+  \r
+  //\r
+  // The attribute for ConInDev, ConOutDev and ErrOutDev does not include NV.\r
+  //\r
+  if (IsNvNeed(ConVarName)) {\r
+    //\r
+    // ConVarName has NV attribute.\r
+    //\r
+    Attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE;\r
+  } else {\r
+    //\r
+    // ConVarName does not have NV attribute.\r
+    //\r
+    Attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS;\r
+  }\r
+  \r
+  //\r
+  // Finally, Update the variable of the default console by NewDevicePath\r
+  //\r
+  gRT->SetVariable (\r
+        ConVarName,\r
+        &gEfiGlobalVariableGuid,\r
+        Attributes,\r
+        GetDevicePathSize (NewDevicePath),\r
+        NewDevicePath\r
+        );\r
+\r
+  if (VarConsole == NewDevicePath) {\r
+    BdsLibSafeFreePool(VarConsole);\r
+  } else {\r
+    BdsLibSafeFreePool(VarConsole);\r
+    BdsLibSafeFreePool(NewDevicePath);\r
+  }\r

 \r
   return EFI_SUCCESS;\r
 \r
 \r
   return EFI_SUCCESS;\r
 \r


@@ -201,7 +222,7 @@ Returns:
     return EFI_UNSUPPORTED;\r
   }\r
 \r
     return EFI_UNSUPPORTED;\r
   }\r
 \r

-  CopyOfDevicePath = DuplicateDevicePath (StartDevicePath);\r
+  CopyOfDevicePath = StartDevicePath;\r

   do {\r
     //\r
     // Check every instance of the console variable\r
   do {\r
     //\r
     // Check every instance of the console variable\r


@@ -226,7 +247,7 @@ Returns:
     } else {\r
       DeviceExist = TRUE;\r
     }\r
     } else {\r
       DeviceExist = TRUE;\r
     }\r

-\r
+    BdsLibSafeFreePool(Instance);\r

   } while (CopyOfDevicePath != NULL);\r
 \r
   gBS->FreePool (StartDevicePath);\r
   } while (CopyOfDevicePath != NULL);\r
 \r
   gBS->FreePool (StartDevicePath);\r


@@ -289,6 +310,8 @@ Returns:
     BdsLibUpdateConsoleVariable (L"ConIn", ConDevicePath, NULL);\r
   }\r
 \r
     BdsLibUpdateConsoleVariable (L"ConIn", ConDevicePath, NULL);\r
   }\r
 \r

+  BdsLibSafeFreePool(HandleBuffer);\r
+\r

   Status = gBS->LocateHandleBuffer (\r
                   ByProtocol,\r
                   &gEfiSimpleTextOutProtocolGuid,\r
   Status = gBS->LocateHandleBuffer (\r
                   ByProtocol,\r
                   &gEfiSimpleTextOutProtocolGuid,\r


@@ -305,6 +328,9 @@ Returns:
     BdsLibUpdateConsoleVariable (L"ConOut", ConDevicePath, NULL);\r
     BdsLibUpdateConsoleVariable (L"ErrOut", ConDevicePath, NULL);\r
   }\r
     BdsLibUpdateConsoleVariable (L"ConOut", ConDevicePath, NULL);\r
     BdsLibUpdateConsoleVariable (L"ErrOut", ConDevicePath, NULL);\r
   }\r

+\r
+  BdsLibSafeFreePool(HandleBuffer);\r
+\r

   //\r
   // Connect all console variables\r
   //\r
   //\r
   // Connect all console variables\r
   //\r


@@ -337,8 +363,6 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS                Status;\r
 --*/\r
 {\r
   EFI_STATUS                Status;\r

-  EFI_DEVICE_PATH_PROTOCOL  *VarErrout;\r
-  UINTN                     DevicePathSize;\r

 \r
   //\r
   // Connect all default console variables\r
 \r
   //\r
   // Connect all default console variables\r


@@ -356,14 +380,7 @@ Returns:
   // Special treat the err out device, becaues the null\r
   // err out var is legal.\r
   //\r
   // Special treat the err out device, becaues the null\r
   // err out var is legal.\r
   //\r

-  VarErrout = BdsLibGetVariableAndSize (\r
-                L"ErrOut",\r
-                &gEfiGlobalVariableGuid,\r
-                &DevicePathSize\r
-                );\r
-  if (VarErrout != NULL) {\r
-    BdsLibConnectConsoleVariable (L"ErrOut");\r
-  }\r
+  BdsLibConnectConsoleVariable (L"ErrOut");\r

 \r
   return EFI_SUCCESS;\r
 \r
 \r
   return EFI_SUCCESS;\r
 \r

diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
index 908bc3059be25fccb14dd691307ecf53cbb071d3..e7add072e18c30da4dfc828356c74df5b92bafc3 100644 (file)
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
@@ -651,6 +651,95 @@ Returns:
   return Buffer;\r
 }\r
 \r
   return Buffer;\r
 }\r
 \r

+VOID\r
+BdsLibSafeFreePool (\r
+  IN  VOID             *Buffer\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Free pool safely.\r
+\r
+Arguments:\r
+  \r
+  Buffer          - The allocated pool entry to free\r
+\r
+Returns:\r
+\r
+  Pointer of the buffer allocated.\r
+\r
+--*/\r
+{\r
+  if (Buffer != NULL) {\r
+    gBS->FreePool (Buffer);\r
+    Buffer = NULL;\r
+  }\r
+}\r
+\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+BdsLibDelPartMatchInstance (\r
+  IN     EFI_DEVICE_PATH_PROTOCOL  *Multi,\r
+  IN     EFI_DEVICE_PATH_PROTOCOL  *Single\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Delete the instance in Multi which matches partly with Single instance\r
+\r
+Arguments:\r
+\r
+  Multi        - A pointer to a multi-instance device path data structure.\r
+\r
+  Single       - A pointer to a single-instance device path data structure.\r
+\r
+Returns:\r
+\r
+  This function will remove the device path instances in Multi which partly \r
+  match with the Single, and return the result device path. If there is no\r
+  remaining device path as a result, this function will return NULL.\r
+\r
+--*/\r
+{\r
+  EFI_DEVICE_PATH_PROTOCOL  *Instance;\r
+  EFI_DEVICE_PATH_PROTOCOL  *NewDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TempNewDevicePath;\r
+  UINTN                     InstanceSize;\r
+  UINTN                     SingleDpSize;  \r
+  UINTN                     Size; \r
+  \r
+  NewDevicePath     = NULL;\r
+  TempNewDevicePath = NULL;\r
+\r
+  if (Multi == NULL || Single == NULL) {\r
+    return Multi;\r
+  }\r
+  \r
+  Instance        =  GetNextDevicePathInstance (&Multi, &InstanceSize);\r
+  SingleDpSize    =  GetDevicePathSize (Single) - END_DEVICE_PATH_LENGTH;\r
+  InstanceSize    -= END_DEVICE_PATH_LENGTH;\r
+\r
+  while (Instance != NULL) {\r
+\r
+    Size = (SingleDpSize < InstanceSize) ? SingleDpSize : InstanceSize;    \r
+        \r
+    if ((CompareMem (Instance, Single, Size) != 0)) {\r
+      //\r
+      // Append the device path instance which does not match with Single\r
+      //\r
+      TempNewDevicePath = NewDevicePath;\r
+      NewDevicePath = AppendDevicePathInstance (NewDevicePath, Instance);\r
+      BdsLibSafeFreePool(TempNewDevicePath);\r
+    }\r
+    BdsLibSafeFreePool(Instance);\r
+    Instance = GetNextDevicePathInstance (&Multi, &InstanceSize);\r
+    InstanceSize  -= END_DEVICE_PATH_LENGTH;\r
+  }\r
+  \r
+  return NewDevicePath;\r
+}\r
+\r

 BOOLEAN\r
 BdsLibMatchDevicePaths (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *Multi,\r
 BOOLEAN\r
 BdsLibMatchDevicePaths (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *Multi,\r

diff --git a/EdkUnixPkg/Include/Library/EdkGenericBdsLib.h b/EdkUnixPkg/Include/Library/EdkGenericBdsLib.h
index ed52085a176d4256af334501938094e13580c2c0..7ec022262023067405cc3b385eb743a0518f5c5f 100644 (file)
--- a/EdkUnixPkg/Include/Library/EdkGenericBdsLib.h
+++ b/EdkUnixPkg/Include/Library/EdkGenericBdsLib.h
@@ -246,6 +246,17 @@ BdsLibUnpackDevicePath (
   IN EFI_DEVICE_PATH_PROTOCOL  *DevPath\r
   );\r
 \r
   IN EFI_DEVICE_PATH_PROTOCOL  *DevPath\r
   );\r
 \r

+VOID\r
+BdsLibSafeFreePool (\r
+  IN  VOID             *Buffer\r
+  );\r
+\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+BdsLibDelPartMatchInstance (\r
+  IN     EFI_DEVICE_PATH_PROTOCOL  *Multi,\r
+  IN     EFI_DEVICE_PATH_PROTOCOL  *Single\r
+  );\r
+\r

 BOOLEAN\r
 BdsLibMatchDevicePaths (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *Multi,\r
 BOOLEAN\r
 BdsLibMatchDevicePaths (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *Multi,\r

diff --git a/EdkUnixPkg/Library/EdkGenericBdsLib/BdsConsole.c b/EdkUnixPkg/Library/EdkGenericBdsLib/BdsConsole.c
index 721d74363a077370195054f527e6d9de9544cd77..6c9097f142eb963ee2e1df3b763822f6157b2090 100644 (file)
--- a/EdkUnixPkg/Library/EdkGenericBdsLib/BdsConsole.c
+++ b/EdkUnixPkg/Library/EdkGenericBdsLib/BdsConsole.c
@@ -19,6 +19,30 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

+BOOLEAN\r
+IsNvNeed (\r
+  IN CHAR16 *ConVarName\r
+  )\r
+{\r
+  CHAR16 *Ptr;\r
+  \r
+  Ptr = ConVarName;\r
+  \r
+  //\r
+  // If the variable includes "Dev" at last, we consider\r
+  // it does not support NV attribute.\r
+  //\r
+  while (*Ptr) {\r
+    Ptr++;\r
+  }\r
+  \r
+  if ((*(Ptr - 3) == 'D') && (*(Ptr - 2) == 'e') && (*(Ptr - 1) == 'v')) {\r
+    return FALSE;\r
+  } else {\r
+    return TRUE;\r
+  }\r
+}\r
+\r

 EFI_STATUS\r
 BdsLibUpdateConsoleVariable (\r
   IN  CHAR16                    *ConVarName,\r
 EFI_STATUS\r
 BdsLibUpdateConsoleVariable (\r
   IN  CHAR16                    *ConVarName,\r


@@ -56,12 +80,12 @@ Returns:
   EFI_STATUS                Status;\r
   EFI_DEVICE_PATH_PROTOCOL  *VarConsole;\r
   UINTN                     DevicePathSize;\r
   EFI_STATUS                Status;\r
   EFI_DEVICE_PATH_PROTOCOL  *VarConsole;\r
   UINTN                     DevicePathSize;\r

-  EFI_DEVICE_PATH_PROTOCOL  *Instance;\r

   EFI_DEVICE_PATH_PROTOCOL  *NewDevicePath;\r
   EFI_DEVICE_PATH_PROTOCOL  *NewDevicePath;\r

+  EFI_DEVICE_PATH_PROTOCOL  *TempNewDevicePath;\r
+  UINT32                    Attributes;\r

 \r
   VarConsole      = NULL;\r
   DevicePathSize  = 0;\r
 \r
   VarConsole      = NULL;\r
   DevicePathSize  = 0;\r

-  NewDevicePath   = NULL;\r

   Status          = EFI_UNSUPPORTED;\r
 \r
   //\r
   Status          = EFI_UNSUPPORTED;\r
 \r
   //\r


@@ -79,73 +103,70 @@ Returns:
                 &gEfiGlobalVariableGuid,\r
                 &DevicePathSize\r
                 );\r
                 &gEfiGlobalVariableGuid,\r
                 &DevicePathSize\r
                 );\r

-\r
+                \r
+  //\r
+  // Initialize NewDevicePath\r
+  //\r
+  NewDevicePath  = VarConsole;\r
+  \r
+  //\r
+  // If ExclusiveDevicePath is even the part of the instance in VarConsole, delete it.\r
+  // In the end, NewDevicePath is the final device path.\r
+  //\r

   if (ExclusiveDevicePath != NULL && VarConsole != NULL) {\r
   if (ExclusiveDevicePath != NULL && VarConsole != NULL) {\r

-    if (BdsLibMatchDevicePaths (VarConsole, ExclusiveDevicePath)) {\r
-\r
-      Instance = GetNextDevicePathInstance (&VarConsole, &DevicePathSize);\r
-\r
-      while (VarConsole != NULL) {\r
-        if (CompareMem (\r
-              Instance,\r
-              ExclusiveDevicePath,\r
-              DevicePathSize - sizeof (EFI_DEVICE_PATH_PROTOCOL)\r
-              ) == 0) {\r
-          //\r
-          // Remove the match part\r
-          //\r
-          NewDevicePath = AppendDevicePathInstance (NewDevicePath, VarConsole);\r
-          break;\r
-        } else {\r
-          //\r
-          // Continue the next instance\r
-          //\r
-          NewDevicePath = AppendDevicePathInstance (NewDevicePath, Instance);\r
-        }\r
-\r
-        Instance = GetNextDevicePathInstance (&VarConsole, &DevicePathSize);\r
-      }\r
-      //\r
-      // Reset the console variable with new device path\r
-      //\r
-      gRT->SetVariable (\r
-            ConVarName,\r
-            &gEfiGlobalVariableGuid,\r
-            EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
-            GetDevicePathSize (NewDevicePath),\r
-            NewDevicePath\r
-            );\r
-    }\r
+      NewDevicePath = BdsLibDelPartMatchInstance (VarConsole, ExclusiveDevicePath);\r

   }\r
   //\r
   }\r
   //\r

-  // Try to append customized device path\r
+  // Try to append customized device path to NewDevicePath.\r

   //\r
   //\r

-  VarConsole = BdsLibGetVariableAndSize (\r
-                ConVarName,\r
-                &gEfiGlobalVariableGuid,\r
-                &DevicePathSize\r
-                );\r
-\r

   if (CustomizedConDevicePath != NULL) {\r
   if (CustomizedConDevicePath != NULL) {\r

-    if (!BdsLibMatchDevicePaths (VarConsole, CustomizedConDevicePath)) {\r
+    if (!BdsLibMatchDevicePaths (NewDevicePath, CustomizedConDevicePath)) {\r

       //\r
       //\r

-      // In the first check, the default console variable will be null,\r
-      // just append current customized device path\r
+      // Check if there is part of CustomizedConDevicePath in NewDevicePath, delete it.\r

       //\r
       //\r

-      VarConsole = AppendDevicePathInstance (VarConsole, CustomizedConDevicePath);\r
-\r
+      NewDevicePath = BdsLibDelPartMatchInstance (NewDevicePath, CustomizedConDevicePath);\r

       //\r
       //\r

-      // Update the variable of the default console\r
+      // In the first check, the default console variable will be null,\r
+      // just append current customized device path\r

       //\r
       //\r

-      gRT->SetVariable (\r
-            ConVarName,\r
-            &gEfiGlobalVariableGuid,\r
-            EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
-            GetDevicePathSize (VarConsole),\r
-            VarConsole\r
-            );\r
+      TempNewDevicePath = NewDevicePath;\r
+      NewDevicePath = AppendDevicePathInstance (NewDevicePath, CustomizedConDevicePath);\r
+      BdsLibSafeFreePool(TempNewDevicePath);\r

     }\r
   }\r
     }\r
   }\r

+  \r
+  //\r
+  // The attribute for ConInDev, ConOutDev and ErrOutDev does not include NV.\r
+  //\r
+  if (IsNvNeed(ConVarName)) {\r
+    //\r
+    // ConVarName has NV attribute.\r
+    //\r
+    Attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE;\r
+  } else {\r
+    //\r
+    // ConVarName does not have NV attribute.\r
+    //\r
+    Attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS;\r
+  }\r
+  \r
+  //\r
+  // Finally, Update the variable of the default console by NewDevicePath\r
+  //\r
+  gRT->SetVariable (\r
+        ConVarName,\r
+        &gEfiGlobalVariableGuid,\r
+        Attributes,\r
+        GetDevicePathSize (NewDevicePath),\r
+        NewDevicePath\r
+        );\r
+\r
+  if (VarConsole == NewDevicePath) {\r
+    BdsLibSafeFreePool(VarConsole);\r
+  } else {\r
+    BdsLibSafeFreePool(VarConsole);\r
+    BdsLibSafeFreePool(NewDevicePath);\r
+  }\r

 \r
   return EFI_SUCCESS;\r
 \r
 \r
   return EFI_SUCCESS;\r
 \r


@@ -201,7 +222,7 @@ Returns:
     return EFI_UNSUPPORTED;\r
   }\r
 \r
     return EFI_UNSUPPORTED;\r
   }\r
 \r

-  CopyOfDevicePath = DuplicateDevicePath (StartDevicePath);\r
+  CopyOfDevicePath = StartDevicePath;\r

   do {\r
     //\r
     // Check every instance of the console variable\r
   do {\r
     //\r
     // Check every instance of the console variable\r


@@ -226,7 +247,7 @@ Returns:
     } else {\r
       DeviceExist = TRUE;\r
     }\r
     } else {\r
       DeviceExist = TRUE;\r
     }\r

-\r
+    BdsLibSafeFreePool(Instance);\r

   } while (CopyOfDevicePath != NULL);\r
 \r
   gBS->FreePool (StartDevicePath);\r
   } while (CopyOfDevicePath != NULL);\r
 \r
   gBS->FreePool (StartDevicePath);\r


@@ -289,6 +310,8 @@ Returns:
     BdsLibUpdateConsoleVariable (L"ConIn", ConDevicePath, NULL);\r
   }\r
 \r
     BdsLibUpdateConsoleVariable (L"ConIn", ConDevicePath, NULL);\r
   }\r
 \r

+  BdsLibSafeFreePool(HandleBuffer);\r
+\r

   Status = gBS->LocateHandleBuffer (\r
                   ByProtocol,\r
                   &gEfiSimpleTextOutProtocolGuid,\r
   Status = gBS->LocateHandleBuffer (\r
                   ByProtocol,\r
                   &gEfiSimpleTextOutProtocolGuid,\r


@@ -305,6 +328,9 @@ Returns:
     BdsLibUpdateConsoleVariable (L"ConOut", ConDevicePath, NULL);\r
     BdsLibUpdateConsoleVariable (L"ErrOut", ConDevicePath, NULL);\r
   }\r
     BdsLibUpdateConsoleVariable (L"ConOut", ConDevicePath, NULL);\r
     BdsLibUpdateConsoleVariable (L"ErrOut", ConDevicePath, NULL);\r
   }\r

+\r
+  BdsLibSafeFreePool(HandleBuffer);\r
+\r

   //\r
   // Connect all console variables\r
   //\r
   //\r
   // Connect all console variables\r
   //\r


@@ -337,8 +363,6 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS                Status;\r
 --*/\r
 {\r
   EFI_STATUS                Status;\r

-  EFI_DEVICE_PATH_PROTOCOL  *VarErrout;\r
-  UINTN                     DevicePathSize;\r

 \r
   //\r
   // Connect all default console variables\r
 \r
   //\r
   // Connect all default console variables\r


@@ -356,14 +380,7 @@ Returns:
   // Special treat the err out device, becaues the null\r
   // err out var is legal.\r
   //\r
   // Special treat the err out device, becaues the null\r
   // err out var is legal.\r
   //\r

-  VarErrout = BdsLibGetVariableAndSize (\r
-                L"ErrOut",\r
-                &gEfiGlobalVariableGuid,\r
-                &DevicePathSize\r
-                );\r
-  if (VarErrout != NULL) {\r
-    BdsLibConnectConsoleVariable (L"ErrOut");\r
-  }\r
+  BdsLibConnectConsoleVariable (L"ErrOut");\r

 \r
   return EFI_SUCCESS;\r
 \r
 \r
   return EFI_SUCCESS;\r
 \r

diff --git a/EdkUnixPkg/Library/EdkGenericBdsLib/BdsMisc.c b/EdkUnixPkg/Library/EdkGenericBdsLib/BdsMisc.c
index 6b4d1aa149a4a712ca8e3821a8f89c2732fd0ad9..2662ba72970548a04f84f7617b45b30560155f37 100644 (file)
--- a/EdkUnixPkg/Library/EdkGenericBdsLib/BdsMisc.c
+++ b/EdkUnixPkg/Library/EdkGenericBdsLib/BdsMisc.c
@@ -652,6 +652,95 @@ Returns:
   return Buffer;\r
 }\r
 \r
   return Buffer;\r
 }\r
 \r

+VOID\r
+BdsLibSafeFreePool (\r
+  IN  VOID             *Buffer\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Free pool safely.\r
+\r
+Arguments:\r
+  \r
+  Buffer          - The allocated pool entry to free\r
+\r
+Returns:\r
+\r
+  Pointer of the buffer allocated.\r
+\r
+--*/\r
+{\r
+  if (Buffer != NULL) {\r
+    gBS->FreePool (Buffer);\r
+    Buffer = NULL;\r
+  }\r
+}\r
+\r
+EFI_DEVICE_PATH_PROTOCOL *\r
+BdsLibDelPartMatchInstance (\r
+  IN     EFI_DEVICE_PATH_PROTOCOL  *Multi,\r
+  IN     EFI_DEVICE_PATH_PROTOCOL  *Single\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Delete the instance in Multi which matches partly with Single instance\r
+\r
+Arguments:\r
+\r
+  Multi        - A pointer to a multi-instance device path data structure.\r
+\r
+  Single       - A pointer to a single-instance device path data structure.\r
+\r
+Returns:\r
+\r
+  This function will remove the device path instances in Multi which partly \r
+  match with the Single, and return the result device path. If there is no\r
+  remaining device path as a result, this function will return NULL.\r
+\r
+--*/\r
+{\r
+  EFI_DEVICE_PATH_PROTOCOL  *Instance;\r
+  EFI_DEVICE_PATH_PROTOCOL  *NewDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TempNewDevicePath;\r
+  UINTN                     InstanceSize;\r
+  UINTN                     SingleDpSize;  \r
+  UINTN                     Size; \r
+  \r
+  NewDevicePath     = NULL;\r
+  TempNewDevicePath = NULL;\r
+\r
+  if (Multi == NULL || Single == NULL) {\r
+    return Multi;\r
+  }\r
+  \r
+  Instance        =  GetNextDevicePathInstance (&Multi, &InstanceSize);\r
+  SingleDpSize    =  GetDevicePathSize (Single) - END_DEVICE_PATH_LENGTH;\r
+  InstanceSize    -= END_DEVICE_PATH_LENGTH;\r
+\r
+  while (Instance != NULL) {\r
+\r
+    Size = (SingleDpSize < InstanceSize) ? SingleDpSize : InstanceSize;    \r
+        \r
+    if ((CompareMem (Instance, Single, Size) != 0)) {\r
+      //\r
+      // Append the device path instance which does not match with Single\r
+      //\r
+      TempNewDevicePath = NewDevicePath;\r
+      NewDevicePath = AppendDevicePathInstance (NewDevicePath, Instance);\r
+      BdsLibSafeFreePool(TempNewDevicePath);\r
+    }\r
+    BdsLibSafeFreePool(Instance);\r
+    Instance = GetNextDevicePathInstance (&Multi, &InstanceSize);\r
+    InstanceSize  -= END_DEVICE_PATH_LENGTH;\r
+  }\r
+  \r
+  return NewDevicePath;\r
+}\r
+\r

 BOOLEAN\r
 BdsLibMatchDevicePaths (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *Multi,\r
 BOOLEAN\r
 BdsLibMatchDevicePaths (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *Multi,\r