OvmfPkg/AcpiPlatformDxe: Fix Visual Studio build issues

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13634 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/AcpiPlatformDxe/Qemu.c b/OvmfPkg/AcpiPlatformDxe/Qemu.c
index 1ac443f3f26990d51a13d53dc0296ca06c0dfe81..5ab89aa6c6f091091489bfb68784fba4da76ecef 100644 (file)
--- a/OvmfPkg/AcpiPlatformDxe/Qemu.c
+++ b/OvmfPkg/AcpiPlatformDxe/Qemu.c
@@ -100,8 +100,8 @@ QemuInstallAcpiMadtTable (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Madt->Header           = *(EFI_ACPI_DESCRIPTION_HEADER *) AcpiTableBuffer;\r
-  Madt->Header.Length    = NewBufferSize;\r
+  CopyMem (&(Madt->Header), AcpiTableBuffer, sizeof (EFI_ACPI_DESCRIPTION_HEADER));\r
+  Madt->Header.Length    = (UINT32) NewBufferSize;\r
   Madt->LocalApicAddress = PcdGet32 (PcdCpuLocalApicBaseAddress);\r
   Madt->Flags            = EFI_ACPI_1_0_PCAT_COMPAT;\r
   Ptr = Madt + 1;\r
@@ -110,8 +110,8 @@ QemuInstallAcpiMadtTable (
   for (Loop = 0; Loop < CpuCount; ++Loop) {\r
     LocalApic->Type            = EFI_ACPI_1_0_PROCESSOR_LOCAL_APIC;\r
     LocalApic->Length          = sizeof (*LocalApic);\r
-    LocalApic->AcpiProcessorId = Loop;\r
-    LocalApic->ApicId          = Loop;\r
+    LocalApic->AcpiProcessorId = (UINT8) Loop;\r
+    LocalApic->ApicId          = (UINT8) Loop;\r
     LocalApic->Flags           = 1; // enabled\r
     ++LocalApic;\r
   }\r
@@ -120,7 +120,7 @@ QemuInstallAcpiMadtTable (
   IoApic = Ptr;\r
   IoApic->Type             = EFI_ACPI_1_0_IO_APIC;\r
   IoApic->Length           = sizeof (*IoApic);\r
-  IoApic->IoApicId         = CpuCount;\r
+  IoApic->IoApicId         = (UINT8) CpuCount;\r
   IoApic->Reserved         = EFI_ACPI_RESERVED_BYTE;\r
   IoApic->IoApicAddress    = 0xFEC00000;\r
   IoApic->SystemVectorBase = 0x00000000;\r
@@ -148,13 +148,13 @@ QemuInstallAcpiMadtTable (
     Iso->Type                        = EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE;\r
     Iso->Length                      = sizeof (*Iso);\r
     Iso->Bus                         = 0x00; // ISA\r
-    Iso->Source                      = Loop;\r
-    Iso->GlobalSystemInterruptVector = Loop;\r
+    Iso->Source                      = (UINT8) Loop;\r
+    Iso->GlobalSystemInterruptVector = (UINT32) Loop;\r
     Iso->Flags                       = 0x000D; // Level-tiggered, Active High\r
     ++Iso;\r
   }\r
   ASSERT (\r
-    Iso - (EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *)Ptr ==\r
+    (UINTN) (Iso - (EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *)Ptr) ==\r
       1 + PciLinkIsoCount\r
     );\r
   Ptr = Iso;\r
@@ -174,7 +174,7 @@ QemuInstallAcpiMadtTable (
   LocalApicNmi->LocalApicInti   = 0x01;\r
   Ptr = LocalApicNmi + 1;\r
 \r
-  ASSERT ((UINT8 *)Ptr - (UINT8 *)Madt == NewBufferSize);\r
+  ASSERT ((UINTN) ((UINT8 *)Ptr - (UINT8 *)Madt) == NewBufferSize);\r
   Status = InstallAcpiTable (AcpiProtocol, Madt, NewBufferSize, TableKey);\r
 \r
   FreePool (Madt);\r