From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id B64967803CF for ; Mon, 20 Nov 2023 00:51:32 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=QnG7yeG2qoWbJvsHqstF4e88eliNQQ5q8tOqnIqsY3w=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1700441491; v=1; b=TPitIk7xxoA/0PNDiuu0ZzJ33daXx5BCNWg4Q1xX/eSTTBnBSN7SLicXZXHy0bGes6Jk4Z37 titPUP9KLbSvyULpQ7r07nln8JgZsYjmCOFnCVBR7TGIEX6LqE0rQQnnsDECPb1PqtnY98wK6Su zQxJ3wg96E7Iwm5lOdh7eB2k= X-Received: by 127.0.0.2 with SMTP id f4TaYY7687511xUXO0VGtsrD; Sun, 19 Nov 2023 16:51:31 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.1668.1700115397135976875 for ; Wed, 15 Nov 2023 22:16:37 -0800 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 229971595; Wed, 15 Nov 2023 22:17:22 -0800 (PST) X-Received: from u102865.austin.arm.com (u102865.arm.com [10.118.16.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 28EBF3F641; Wed, 15 Nov 2023 22:16:36 -0800 (PST) From: "Daniel Nguyen" To: devel@edk2.groups.io Cc: Daniel Nguyen Subject: [edk2-devel] [PATCH] Modified ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c to follow error handling instead of success handling Date: Thu, 16 Nov 2023 00:16:22 -0600 Message-Id: <26fd376786f612b73bf15748b1409e30cb13b860.1700115374.git.daniel.nguyen@arm.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: 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,daniel.nguyen@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: VjCrnUfHVBooXrtmcAU9BEpOx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=TPitIk7x; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Signed-off-by: Daniel Nguyen --- .../UefiShellLevel2CommandsLib/Reset.c | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c b/ShellPkg= /Library/UefiShellLevel2CommandsLib/Reset.c index 57ba3c90f3..361c47e430 100644 --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c @@ -79,30 +79,35 @@ ShellCommandRunReset ( &DataSize,=0D &OsIndications=0D );=0D - if (!EFI_ERROR (Status)) {=0D - if ((OsIndications & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) !=3D 0) {= =0D - DataSize =3D sizeof (OsIndications);=0D - Status =3D gRT->GetVariable (=0D - EFI_OS_INDICATIONS_VARIABLE_NAME,=0D - &gEfiGlobalVariableGuid,=0D - &Attr,=0D - &DataSize,=0D - &OsIndications=0D - );=0D - if (!EFI_ERROR (Status)) {=0D - OsIndications |=3D EFI_OS_INDICATIONS_BOOT_TO_FW_UI;=0D - } else {=0D - OsIndications =3D EFI_OS_INDICATIONS_BOOT_TO_FW_UI;=0D - }=0D -=0D - Status =3D gRT->SetVariable (=0D +=0D + if (EFI_ERROR (Status)) {=0D + ShellStatus =3D SHELL_UNSUPPORTED;=0D + goto Error;=0D + }=0D +=0D + if ((OsIndications & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) !=3D 0) {=0D + DataSize =3D sizeof (OsIndications);=0D + Status =3D gRT->GetVariable (=0D EFI_OS_INDICATIONS_VARIABLE_NAME,=0D &gEfiGlobalVariableGuid,=0D - EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTS= ERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,=0D - sizeof (OsIndications),=0D + &Attr,=0D + &DataSize,=0D &OsIndications=0D );=0D +=0D + if (EFI_ERROR (Status)) {=0D + OsIndications =3D EFI_OS_INDICATIONS_BOOT_TO_FW_UI;=0D + } else {=0D + OsIndications |=3D EFI_OS_INDICATIONS_BOOT_TO_FW_UI;=0D }=0D +=0D + Status =3D gRT->SetVariable (=0D + EFI_OS_INDICATIONS_VARIABLE_NAME,=0D + &gEfiGlobalVariableGuid,=0D + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSER= VICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,=0D + sizeof (OsIndications),=0D + &OsIndications=0D + );=0D }=0D =0D if (EFI_ERROR (Status)) {=0D --=20 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111429): https://edk2.groups.io/g/devel/message/111429 Mute This Topic: https://groups.io/mt/102698984/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-