diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2016-10-21 11:59:36 +0200 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2016-10-25 10:46:33 +0200 |
| commit | a9f63d697f6959772618691eda252d99c207b6c0 (patch) | |
| tree | ecfe8889abc4ce20d109a2e7d77ab8af6ea18f85 | |
| parent | a79d29b6d340529029630af05c44a904827b2b63 (diff) | |
| download | edk2-a9f63d697f6959772618691eda252d99c207b6c0.tar.gz edk2-a9f63d697f6959772618691eda252d99c207b6c0.tar.bz2 edk2-a9f63d697f6959772618691eda252d99c207b6c0.zip | |
ArmVirtPkg/ArmVirtPlatformLib: eliminate unchecked PcdSetXX() calls
These are deprecated / disabled under the
DISABLE_NEW_DEPRECATED_INTERFACES feature test macro.
Introduce a variable called PcdStatus, and use it to assert the success of
these operations (there is no reason for them to fail here).
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=165
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> # RVCT
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
| -rw-r--r-- | ArmVirtPkg/Library/ArmVirtPlatformLib/Virt.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/ArmVirtPkg/Library/ArmVirtPlatformLib/Virt.c b/ArmVirtPkg/Library/ArmVirtPlatformLib/Virt.c index 7a0fc0e75e..fcaf3c681a 100644 --- a/ArmVirtPkg/Library/ArmVirtPlatformLib/Virt.c +++ b/ArmVirtPkg/Library/ArmVirtPlatformLib/Virt.c @@ -70,13 +70,14 @@ ArmPlatformInitializeSystemMemory ( VOID
)
{
- VOID *DeviceTreeBase;
- INT32 Node, Prev;
- UINT64 NewBase, CurBase;
- UINT64 NewSize, CurSize;
- CONST CHAR8 *Type;
- INT32 Len;
- CONST UINT64 *RegProp;
+ VOID *DeviceTreeBase;
+ INT32 Node, Prev;
+ UINT64 NewBase, CurBase;
+ UINT64 NewSize, CurSize;
+ CONST CHAR8 *Type;
+ INT32 Len;
+ CONST UINT64 *RegProp;
+ RETURN_STATUS PcdStatus;
NewBase = 0;
NewSize = 0;
@@ -131,7 +132,8 @@ ArmPlatformInitializeSystemMemory ( // Make sure the start of DRAM matches our expectation
//
ASSERT (FixedPcdGet64 (PcdSystemMemoryBase) == NewBase);
- PcdSet64 (PcdSystemMemorySize, NewSize);
+ PcdStatus = PcdSet64S (PcdSystemMemorySize, NewSize);
+ ASSERT_RETURN_ERROR (PcdStatus);
//
// We need to make sure that the machine we are running on has at least
|