[edk2-devel] [PATCH 16/35] MdeModulePkg/S3SaveState: cast Position for S3BootScriptLib explicitly

Laszlo Ersek posted 35 patches 6 years, 4 months ago
[edk2-devel] [PATCH 16/35] MdeModulePkg/S3SaveState: cast Position for S3BootScriptLib explicitly
Posted by Laszlo Ersek 6 years, 4 months ago
The BootScriptInsert() and BootScriptLabel() functions take the in/out
parameter "Position" as (EFI_S3_BOOT_SCRIPT_POSITION*), and pass it to
S3BootScriptMoveLastOpcode() and S3BootScriptLabel(), respectively.

The callees take the in/out parameter "Position" as (VOID**). Add explicit
casts for clarity.

There is no change in functionality.

Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---

Notes:
    lightly tested: multiple drivers in OVMF write S3 boot script fragments

 MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c    | 4 ++--
 MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
index e94d15772d78..cfa8ebbd2f5d 100644
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
+++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
@@ -810,7 +810,7 @@ BootScriptInsert (
   }
 
   if (!EFI_ERROR (Status)) {
-   Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, Position);
+   Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, (VOID **)Position);
   }
   return Status;
 }
@@ -851,7 +851,7 @@ BootScriptLabel (
   IN CONST CHAR8                                *Label
   )
 {
-  return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, Label);
+  return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, (VOID **)Position, Label);
 }
 /**
   Compare two positions in the boot script table and return their relative position.
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
index 9637df4fb82a..fc6d29e48ba9 100644
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
+++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
@@ -808,7 +808,7 @@ BootScriptInsert (
   }
 
   if (!EFI_ERROR (Status)) {
-   Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, Position);
+   Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, (VOID **)Position);
   }
   return Status;
 }
@@ -849,7 +849,7 @@ BootScriptLabel (
   IN CONST CHAR8                                *Label
   )
 {
-  return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, Label);
+  return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, (VOID **)Position, Label);
 }
 /**
   Compare two positions in the boot script table and return their relative position.
-- 
2.19.1.3.g30247aa5d201



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#47403): https://edk2.groups.io/g/devel/message/47403
Mute This Topic: https://groups.io/mt/34180217/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH 16/35] MdeModulePkg/S3SaveState: cast Position for S3BootScriptLib explicitly
Posted by Dandan Bi 6 years, 4 months ago
Reviewed-by: Dandan Bi <dandan.bi@intel.com>

Thanks,
Dandan

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Laszlo Ersek
> Sent: Wednesday, September 18, 2019 3:49 AM
> To: edk2-devel-groups-io <devel@edk2.groups.io>
> Cc: Bi, Dandan <dandan.bi@intel.com>; Dong, Eric <eric.dong@intel.com>;
> Wu, Hao A <hao.a.wu@intel.com>; Wang, Jian J <jian.j.wang@intel.com>;
> Gao, Liming <liming.gao@intel.com>; Ni, Ray <ray.ni@intel.com>
> Subject: [edk2-devel] [PATCH 16/35] MdeModulePkg/S3SaveState: cast
> Position for S3BootScriptLib explicitly
> 
> The BootScriptInsert() and BootScriptLabel() functions take the in/out
> parameter "Position" as (EFI_S3_BOOT_SCRIPT_POSITION*), and pass it to
> S3BootScriptMoveLastOpcode() and S3BootScriptLabel(), respectively.
> 
> The callees take the in/out parameter "Position" as (VOID**). Add explicit
> casts for clarity.
> 
> There is no change in functionality.
> 
> Cc: Dandan Bi <dandan.bi@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
> 
> Notes:
>     lightly tested: multiple drivers in OVMF write S3 boot script fragments
> 
>  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c    | 4 ++--
>  MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c | 4
> ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
> b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
> index e94d15772d78..cfa8ebbd2f5d 100644
> --- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
> +++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
> @@ -810,7 +810,7 @@ BootScriptInsert (
>    }
> 
>    if (!EFI_ERROR (Status)) {
> -   Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, Position);
> +   Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, (VOID
> + **)Position);
>    }
>    return Status;
>  }
> @@ -851,7 +851,7 @@ BootScriptLabel (
>    IN CONST CHAR8                                *Label
>    )
>  {
> -  return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position,
> Label);
> +  return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, (VOID
> + **)Position, Label);
>  }
>  /**
>    Compare two positions in the boot script table and return their relative
> position.
> diff --git
> a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
> b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
> index 9637df4fb82a..fc6d29e48ba9 100644
> --- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
> +++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
> @@ -808,7 +808,7 @@ BootScriptInsert (
>    }
> 
>    if (!EFI_ERROR (Status)) {
> -   Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, Position);
> +   Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, (VOID
> + **)Position);
>    }
>    return Status;
>  }
> @@ -849,7 +849,7 @@ BootScriptLabel (
>    IN CONST CHAR8                                *Label
>    )
>  {
> -  return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position,
> Label);
> +  return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, (VOID
> + **)Position, Label);
>  }
>  /**
>    Compare two positions in the boot script table and return their relative
> position.
> --
> 2.19.1.3.g30247aa5d201
> 
> 
> 
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> 
> View/Reply Online (#47403): https://edk2.groups.io/g/devel/message/47403
> Mute This Topic: https://groups.io/mt/34180217/1768738
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub  [dandan.bi@intel.com]
> -=-=-=-=-=-=


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#47519): https://edk2.groups.io/g/devel/message/47519
Mute This Topic: https://groups.io/mt/34180217/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-