1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH v1] EmulatorPkg: Rename Variable

Nate DeSimone posted 1 patch 1 year, 2 months ago
Failed in applying to current master (apply log)
EmulatorPkg/Unix/Host/Host.c | 12 ++++++------
EmulatorPkg/Unix/Host/Host.h |  4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
[edk2-devel] [PATCH v1] EmulatorPkg: Rename Variable
Posted by Nate DeSimone 1 year, 2 months ago 
From: Nate DeSimone <nathaniel.l.desimone@intel.com>

Rename PeiCorePe32File to SecCorePe32File, because the variable
actually contains the SEC core... not PEI core.

Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
 EmulatorPkg/Unix/Host/Host.c | 12 ++++++------
 EmulatorPkg/Unix/Host/Host.h |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c
index 1f29dd00a3..940e1953af 100644
--- a/EmulatorPkg/Unix/Host/Host.c
+++ b/EmulatorPkg/Unix/Host/Host.c
@@ -1,6 +1,6 @@
 /*++ @file
 
-Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>
 Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -535,7 +535,7 @@ Arguments:
   LargestRegion           - Memory to use for SEC.
   LargestRegionSize       - Size of Memory to use for PEI
   BootFirmwareVolumeBase  - Start of the Boot FV
-  PeiCorePe32File         - SEC PE32
+  SecCorePe32File         - SEC PE32
 
 Returns:
   Success means control is transferred and thus we should never return
@@ -546,13 +546,13 @@ SecLoadFromCore (
   IN  UINTN  LargestRegion,
   IN  UINTN  LargestRegionSize,
   IN  UINTN  BootFirmwareVolumeBase,
-  IN  VOID   *PeiCorePe32File
+  IN  VOID   *SecCorePe32File
   )
 {
   EFI_STATUS            Status;
   EFI_PHYSICAL_ADDRESS  TopOfMemory;
   VOID                  *TopOfStack;
-  EFI_PHYSICAL_ADDRESS  PeiCoreEntryPoint;
+  EFI_PHYSICAL_ADDRESS  SecCoreEntryPoint;
   EFI_SEC_PEI_HAND_OFF  *SecCoreData;
   UINTN                 PeiStackSize;
 
@@ -597,7 +597,7 @@ SecLoadFromCore (
   //
   // Find the SEC Core Entry Point
   //
-  Status = SecPeCoffGetEntryPoint (PeiCorePe32File, (VOID **)&PeiCoreEntryPoint);
+  Status = SecPeCoffGetEntryPoint (SecCorePe32File, (VOID **)&SecCoreEntryPoint);
   if (EFI_ERROR (Status)) {
     return;
   }
@@ -606,7 +606,7 @@ SecLoadFromCore (
   // Transfer control to the SEC Core
   //
   PeiSwitchStacks (
-    (SWITCH_STACK_ENTRY_POINT)(UINTN)PeiCoreEntryPoint,
+    (SWITCH_STACK_ENTRY_POINT)(UINTN)SecCoreEntryPoint,
     SecCoreData,
     (VOID *)gPpiList,
     TopOfStack
diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h
index 0c81cdfc01..aecebc0143 100644
--- a/EmulatorPkg/Unix/Host/Host.h
+++ b/EmulatorPkg/Unix/Host/Host.h
@@ -1,6 +1,6 @@
 /*++ @file
 
-Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>
 Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
 
 SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -162,7 +162,7 @@ SecLoadFromCore (
   IN  UINTN  LargestRegion,
   IN  UINTN  LargestRegionSize,
   IN  UINTN  BootFirmwareVolumeBase,
-  IN  VOID   *PeiCoreFile
+  IN  VOID   *SecCoreFile
   );
 
 EFI_STATUS
-- 
2.30.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#100564): https://edk2.groups.io/g/devel/message/100564
Mute This Topic: https://groups.io/mt/97308245/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v1] EmulatorPkg: Rename Variable
Posted by Ni, Ray 1 year, 2 months ago 
Nice change😊

Acked-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> Sent: Wednesday, March 1, 2023 12:55 PM
> To: devel@edk2.groups.io
> Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Andrew Fish
> <afish@apple.com>; Ni, Ray <ray.ni@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>
> Subject: [PATCH v1] EmulatorPkg: Rename Variable
> 
> From: Nate DeSimone <nathaniel.l.desimone@intel.com>
> 
> Rename PeiCorePe32File to SecCorePe32File, because the variable
> actually contains the SEC core... not PEI core.
> 
> Cc: Andrew Fish <afish@apple.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> ---
>  EmulatorPkg/Unix/Host/Host.c | 12 ++++++------
>  EmulatorPkg/Unix/Host/Host.h |  4 ++--
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c
> index 1f29dd00a3..940e1953af 100644
> --- a/EmulatorPkg/Unix/Host/Host.c
> +++ b/EmulatorPkg/Unix/Host/Host.c
> @@ -1,6 +1,6 @@
>  /*++ @file
> 
> -Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>
>  Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
> @@ -535,7 +535,7 @@ Arguments:
>    LargestRegion           - Memory to use for SEC.
>    LargestRegionSize       - Size of Memory to use for PEI
>    BootFirmwareVolumeBase  - Start of the Boot FV
> -  PeiCorePe32File         - SEC PE32
> +  SecCorePe32File         - SEC PE32
> 
>  Returns:
>    Success means control is transferred and thus we should never return
> @@ -546,13 +546,13 @@ SecLoadFromCore (
>    IN  UINTN  LargestRegion,
>    IN  UINTN  LargestRegionSize,
>    IN  UINTN  BootFirmwareVolumeBase,
> -  IN  VOID   *PeiCorePe32File
> +  IN  VOID   *SecCorePe32File
>    )
>  {
>    EFI_STATUS            Status;
>    EFI_PHYSICAL_ADDRESS  TopOfMemory;
>    VOID                  *TopOfStack;
> -  EFI_PHYSICAL_ADDRESS  PeiCoreEntryPoint;
> +  EFI_PHYSICAL_ADDRESS  SecCoreEntryPoint;
>    EFI_SEC_PEI_HAND_OFF  *SecCoreData;
>    UINTN                 PeiStackSize;
> 
> @@ -597,7 +597,7 @@ SecLoadFromCore (
>    //
>    // Find the SEC Core Entry Point
>    //
> -  Status = SecPeCoffGetEntryPoint (PeiCorePe32File, (VOID
> **)&PeiCoreEntryPoint);
> +  Status = SecPeCoffGetEntryPoint (SecCorePe32File, (VOID
> **)&SecCoreEntryPoint);
>    if (EFI_ERROR (Status)) {
>      return;
>    }
> @@ -606,7 +606,7 @@ SecLoadFromCore (
>    // Transfer control to the SEC Core
>    //
>    PeiSwitchStacks (
> -    (SWITCH_STACK_ENTRY_POINT)(UINTN)PeiCoreEntryPoint,
> +    (SWITCH_STACK_ENTRY_POINT)(UINTN)SecCoreEntryPoint,
>      SecCoreData,
>      (VOID *)gPpiList,
>      TopOfStack
> diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h
> index 0c81cdfc01..aecebc0143 100644
> --- a/EmulatorPkg/Unix/Host/Host.h
> +++ b/EmulatorPkg/Unix/Host/Host.h
> @@ -1,6 +1,6 @@
>  /*++ @file
> 
> -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>
>  Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
> 
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -162,7 +162,7 @@ SecLoadFromCore (
>    IN  UINTN  LargestRegion,
>    IN  UINTN  LargestRegionSize,
>    IN  UINTN  BootFirmwareVolumeBase,
> -  IN  VOID   *PeiCoreFile
> +  IN  VOID   *SecCoreFile
>    );
> 
>  EFI_STATUS
> --
> 2.30.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#100567): https://edk2.groups.io/g/devel/message/100567
Mute This Topic: https://groups.io/mt/97308245/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076/xyzzy [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.