OvmfPkg/Xen: Fix VS2019 build issues

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3722

Fix VS2019 NOOPT build issues related to converting
a larger integer value to a smaller integer value.

Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Julien Grall <julien@xen.org>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>

diff --git a/OvmfPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.c b/OvmfPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.c
index e113bc89bd75979d2f95f1d58f910ec7e17eca86..72e0aaa8798c5da79ce7ce7a41ce28cc6c47ce48 100644 (file)
--- a/OvmfPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.c
+++ b/OvmfPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.c
@@ -53,9 +53,9 @@ EpochToEfiTime (
   m  = (((da * 5) + 308) / 153) - 2;\r
   d  = da - (((m + 4) * 153) / 5) + 122;\r
 \r
-  Time->Year  = y - 4800 + ((m + 2) / 12);\r
+  Time->Year  = (UINT16)(y - 4800 + ((m + 2) / 12));\r
   Time->Month = ((m + 2) % 12) + 1;\r
-  Time->Day   = d + 1;\r
+  Time->Day   = (UINT8)(d + 1);\r
 \r
   ss = EpochSeconds % 60;\r
   a  = (EpochSeconds - ss) / 60;\r
@@ -63,9 +63,9 @@ EpochToEfiTime (
   b = (a - mm) / 60;\r
   hh = b % 24;\r
 \r
-  Time->Hour        = hh;\r
-  Time->Minute      = mm;\r
-  Time->Second      = ss;\r
+  Time->Hour        = (UINT8)hh;\r
+  Time->Minute      = (UINT8)mm;\r
+  Time->Second      = (UINT8)ss;\r
   Time->Nanosecond  = 0;\r
 \r
 }\r

diff --git a/OvmfPkg/XenPlatformPei/MemDetect.c b/OvmfPkg/XenPlatformPei/MemDetect.c
index 1970b631c94d32fdec7fca547ff027f75340f50f..fa1be888d6ba6d864dc93077b6e1b931bbab4428 100644 (file)
--- a/OvmfPkg/XenPlatformPei/MemDetect.c
+++ b/OvmfPkg/XenPlatformPei/MemDetect.c
@@ -154,7 +154,7 @@ GetSystemMemorySizeBelow4gb (
     HighestAddress = GetHighestSystemMemoryAddress (TRUE);\r
     ASSERT (HighestAddress > 0 && HighestAddress <= BASE_4GB);\r
 \r
-    return HighestAddress;\r
+    return (UINT32)HighestAddress;\r
   }\r
 \r
   //\r

diff --git a/OvmfPkg/XenTimerDxe/XenTimerDxe.c b/OvmfPkg/XenTimerDxe/XenTimerDxe.c
index 0bec59382b0ab59ed6c8b0129ffde46c8a7315b4..19fa17a29fb424ab7dd2623beab95a766d8daee2 100644 (file)
--- a/OvmfPkg/XenTimerDxe/XenTimerDxe.c
+++ b/OvmfPkg/XenTimerDxe/XenTimerDxe.c
@@ -165,7 +165,7 @@ TimerDriverSetTimerPeriod (
 {\r
   UINT64  TimerCount;\r
   UINT32  TimerFrequency;\r
-  UINTN   DivideValue = 1;\r
+  UINT32  DivideValue = 1;\r
 \r
   if (TimerPeriod == 0) {\r
     //\r
@@ -193,7 +193,7 @@ TimerDriverSetTimerPeriod (
     //\r
     // Program the timer with the new count value\r
     //\r
-    InitializeApicTimer(DivideValue, TimerCount, TRUE, LOCAL_APIC_TIMER_VECTOR);\r
+    InitializeApicTimer(DivideValue, (UINT32)TimerCount, TRUE, LOCAL_APIC_TIMER_VECTOR);\r
 \r
     //\r
     // Enable timer interrupt\r