From ea5396f31a8db7344177b4dd5335ebd617861d58 Mon Sep 17 00:00:00 2001
From: Ruiyu Ni <ruiyu.ni@intel.com>
Date: Wed, 13 Aug 2014 06:31:08 +0000
Subject: [PATCH 1/1] Fix VS2013 build failure.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15795 6f19259b-4bc3-4df7-8a09-765794883524
---
 OvmfPkg/Library/NvVarsFileLib/FsAccess.c     | 4 +++-
 OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c | 5 +++--
 OvmfPkg/QemuVideoDxe/VbeShim.c               | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/OvmfPkg/Library/NvVarsFileLib/FsAccess.c b/OvmfPkg/Library/NvVarsFileLib/FsAccess.c
index 937e4abe19..66b5566c75 100644
--- a/OvmfPkg/Library/NvVarsFileLib/FsAccess.c
+++ b/OvmfPkg/Library/NvVarsFileLib/FsAccess.c
@@ -1,7 +1,7 @@
 /** @file
   File System Access for NvVarsFileLib
 
-  Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -432,6 +432,8 @@ SaveNvVarsToFs (
   VOID                        *VariableData;
   EFI_HANDLE                  SerializedVariables;
 
+  SerializedVariables = NULL;
+
   Status = SerializeVariablesNewInstance (&SerializedVariables);
   if (EFI_ERROR (Status)) {
     return Status;
diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
index 9f953acf79..2a1ca88c2c 100644
--- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -1,7 +1,7 @@
 /** @file
   Platform BDS customizations.
 
-  Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -367,7 +367,8 @@ Returns:
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;
   EFI_DEVICE_PATH_PROTOCOL  *GopDevicePath;
 
-  DevicePath = NULL;
+  DevicePath    = NULL;
+  GopDevicePath = NULL;
   Status = gBS->HandleProtocol (
                   DeviceHandle,
                   &gEfiDevicePathProtocolGuid,
diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.c b/OvmfPkg/QemuVideoDxe/VbeShim.c
index ae25b644cf..81c11664f4 100644
--- a/OvmfPkg/QemuVideoDxe/VbeShim.c
+++ b/OvmfPkg/QemuVideoDxe/VbeShim.c
@@ -268,8 +268,8 @@ InstallVbeShim (
   //
   // Second, point the Int10h vector at the shim.
   //
-  Int0x10->Segment = SegmentC >> 4;
-  Int0x10->Offset  = (EFI_PHYSICAL_ADDRESS)(UINTN)(VbeModeInfo + 1) - SegmentC;
+  Int0x10->Segment = (UINT16) (SegmentC >> 4);
+  Int0x10->Offset  = (UINT16) ((UINTN) (VbeModeInfo + 1) - SegmentC);
 
   DEBUG ((EFI_D_INFO, "%a: VBE shim installed\n", __FUNCTION__));
 }
-- 
2.39.2