From nobody Mon Feb 9 12:26:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47403+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47403+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568749818; cv=none; d=zoho.com; s=zohoarc; b=NBCTZReSQ35C27/CZ6ZRx/Pr57UMgnMxnM9vtO8pae5CFwh3BGMOwxcV6G+xtS0Blcx/hOblQ3ZpA/QC44ato0aHQC5/Ww4f7lV9lnxgcn7g6y7cvsHDOABSrFJLNeGz1OJ01lGGkBdJq7UX9gNJ/7GXdhdtqCvAHN+Hbxhiu1M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568749818; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=NGK3P9+wE09crGCUDF1Opo1PRn3IPZwRMfpPp7scCiM=; b=e9MuUf/1AFZ52bDFz1pX1vA8UTDWnpTzZ+DLzqm93NA6xjJMJ2J7NS7zu/4gIwuDlIdrSIZylGO3h1G+xnJBumzwMv//cMuVw7dboVh2E5jfHdWPw3C180SZetFdKyX8us8h4NvqDjTP3jN6twhyuN01XZ1oL5QIDoAuD/MmZYA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47403+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568749818630888.3475353750613; Tue, 17 Sep 2019 12:50:18 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id g3JJYY1788612xRZ1uJQykyF; Tue, 17 Sep 2019 12:50:18 -0700 X-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 X-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) X-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: [edk2-devel] [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) Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com X-Gm-Message-State: lz0hLyHRVECFZzoMGwJgYRgBx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568749818; bh=UOhqLdymkZR0IiR8TonqrxLg0ds1HVbznmevwyPK+sY=; h=Cc:Date:From:Reply-To:Subject:To; b=i4ib1DJY6y1TEd3m0WwegaMcG/1sEdYWmqPV2Wb30LdDo2h4a01AKEEZ5656FDMIumu 5Y5SejFAwlcb/xiVjBoEH8Nl2gDLUjMoG2nO92zYLHh4UkFc/KUFBDctJmVeVpoh5mSz+ eboVgRyGt/BAPTMJ8d9pPKtov6qwTXtBz5g= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 Cc: Eric Dong Cc: Hao A Wu Cc: Jian J Wang Cc: Liming Gao Cc: Ray Ni Signed-off-by: Laszlo Ersek Reviewed-by: Dandan Bi --- 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/Mde= ModulePkg/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 **)Position= ); } return Status; } @@ -851,7 +851,7 @@ BootScriptLabel ( IN CONST CHAR8 *Label ) { - return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, Lab= el); + return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, (VOID **)Posi= tion, 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 ( } =20 if (!EFI_ERROR (Status)) { - Status =3D S3BootScriptMoveLastOpcode (BeforeOrAfter, Position); + Status =3D S3BootScriptMoveLastOpcode (BeforeOrAfter, (VOID **)Position= ); } return Status; } @@ -849,7 +849,7 @@ BootScriptLabel ( IN CONST CHAR8 *Label ) { - return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, Lab= el); + return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, (VOID **)Posi= tion, Label); } /** Compare two positions in the boot script table and return their relative= position. --=20 2.19.1.3.g30247aa5d201 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- 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] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-