diff options
author | Dandan Bi <dandan.bi@intel.com> | 2018-03-23 11:21:56 +0800 |
---|---|---|
committer | Liming Gao <liming.gao@intel.com> | 2018-03-28 09:58:49 +0800 |
commit | 699a2c30cb6e74a55f0c3f67c376460f99c201ed (patch) | |
tree | 039d4be3c443f3cd721f2b39d8c5d5f9bfe43d30 /OvmfPkg/VirtioBlkDxe | |
parent | d1b777440bc616f1e6da9204f3eec9f7a5a6f2e2 (diff) | |
download | edk2-699a2c30cb6e74a55f0c3f67c376460f99c201ed.tar.gz edk2-699a2c30cb6e74a55f0c3f67c376460f99c201ed.tar.bz2 edk2-699a2c30cb6e74a55f0c3f67c376460f99c201ed.zip |
OvmfPkg:Fix VS2012 build failure
Initialize local variable to suppress warning C4701/C4703:
potentially uninitialized local variable/pointer variable.
1.In VirtualMemory.c:
Read of "PageMapLevel4Entry" in SetMemoryEncDe() is only
reached when "PageMapLevel4Entry" is got correctly.
2.In VirtioBlk.c:
Reads (dereferences) of "BufferMapping" and "BufferDeviceAddress"
in SynchronousRequest() are only reached if "BufferSize > 0" *and*
we map the data buffer successfully.
3.In VirtioScsi.c:
Reads (dereferences) of "InDataMapping" and "InDataDeviceAddress",
in VirtioScsiPassThru() are only reached if
"Packet->InTransferLength > 0" on input, *and* we map the
input buffer successfully. The similar reason for "OutDataMapping"
and "OutDataDeviceAddress".
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'OvmfPkg/VirtioBlkDxe')
-rw-r--r-- | OvmfPkg/VirtioBlkDxe/VirtioBlk.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c index 5559884345..95e42ef3dc 100644 --- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c +++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c @@ -11,7 +11,7 @@ synchronous requests and EFI_BLOCK_IO_PROTOCOL for now.
Copyright (C) 2012, Red Hat, Inc.
- Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2017, AMD Inc, All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
@@ -265,6 +265,13 @@ SynchronousRequest ( BlockSize = Dev->BlockIoMedia.BlockSize;
//
+ // Set BufferMapping and BufferDeviceAddress to suppress incorrect
+ // compiler/analyzer warnings.
+ //
+ BufferMapping = NULL;
+ BufferDeviceAddress = 0;
+
+ //
// ensured by VirtioBlkInit()
//
ASSERT (BlockSize > 0);
|