From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: redhat.com, ip: 209.132.183.28, mailfrom: lersek@redhat.com) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Tue, 17 Sep 2019 12:50:17 -0700 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 528E981F10; Tue, 17 Sep 2019 19:50:17 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-37.rdu2.redhat.com [10.10.120.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70458600C4; Tue, 17 Sep 2019 19:50:15 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Dandan Bi , Eric Dong , Hao A Wu , Jian J Wang , Liming Gao , Ray Ni Subject: [PATCH 16/35] MdeModulePkg/S3SaveState: cast Position for S3BootScriptLib explicitly Date: Tue, 17 Sep 2019 21:49:16 +0200 Message-Id: <20190917194935.24322-17-lersek@redhat.com> In-Reply-To: <20190917194935.24322-1-lersek@redhat.com> References: <20190917194935.24322-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 17 Sep 2019 19:50:17 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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 explici= t casts for clarity. There is no change in functionality. Cc: Dandan Bi Cc: Eric Dong Cc: Hao A Wu Cc: Jian J Wang Cc: Liming Gao Cc: Ray Ni Signed-off-by: Laszlo Ersek --- Notes: lightly tested: multiple drivers in OVMF write S3 boot script fragmen= ts 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/M= deModulePkg/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 ( } =20 if (!EFI_ERROR (Status)) { - Status =3D S3BootScriptMoveLastOpcode (BeforeOrAfter, Position); + Status =3D S3BootScriptMoveLastOpcode (BeforeOrAfter, (VOID **)Positi= on); } return Status; } @@ -851,7 +851,7 @@ BootScriptLabel ( IN CONST CHAR8 *Label ) { - return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, L= abel); + return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, (VOID **)Po= sition, Label); } /** Compare two positions in the boot script table and return their relati= ve 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 ( } =20 if (!EFI_ERROR (Status)) { - Status =3D S3BootScriptMoveLastOpcode (BeforeOrAfter, Position); + Status =3D S3BootScriptMoveLastOpcode (BeforeOrAfter, (VOID **)Positi= on); } return Status; } @@ -849,7 +849,7 @@ BootScriptLabel ( IN CONST CHAR8 *Label ) { - return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, L= abel); + return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, (VOID **)Po= sition, Label); } /** Compare two positions in the boot script table and return their relati= ve position. --=20 2.19.1.3.g30247aa5d201