OvmfPkg/XenBusDxe: fix VS2010 build failures

This patch contain only type cast.

Contributed-under: TianoCore Contribution Agreement 1.0

Signed-off-by: Scott Duplichan <scott@notabs.org>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Build-tested-by: Scott Duplichan <scott@notabs.org>
Acked-by: Laszlo Ersek <lersek@redhat.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16392 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/XenBusDxe/EventChannel.c b/OvmfPkg/XenBusDxe/EventChannel.c
index 547c111aae499fc515b0f1bf9f8975d95fe6d68b..03efaf9cb90417440a8d711074ed4ee4898a66fa 100644 (file)
--- a/OvmfPkg/XenBusDxe/EventChannel.c
+++ b/OvmfPkg/XenBusDxe/EventChannel.c
@@ -29,7 +29,7 @@ XenEventChannelNotify (
 \r
   Send.port = Port;\r
   ReturnCode = XenHypercallEventChannelOp (Dev, EVTCHNOP_send, &Send);\r
-  return ReturnCode;\r
+  return (UINT32)ReturnCode;\r
 }\r
 \r
 UINT32\r
@@ -48,7 +48,7 @@ XenBusEventChannelAllocate (
 \r
   Parameter.dom = DOMID_SELF;\r
   Parameter.remote_dom = DomainId;\r
-  ReturnCode = XenHypercallEventChannelOp (Private->Dev,\r
+  ReturnCode = (UINT32)XenHypercallEventChannelOp (Private->Dev,\r
                                    EVTCHNOP_alloc_unbound,\r
                                    &Parameter);\r
   if (ReturnCode != 0) {\r
@@ -84,5 +84,5 @@ XenBusEventChannelClose (
 \r
   Private = XENBUS_PRIVATE_DATA_FROM_THIS (This);\r
   Close.port = Port;\r
-  return XenHypercallEventChannelOp (Private->Dev, EVTCHNOP_close, &Close);\r
+  return (UINT32)XenHypercallEventChannelOp (Private->Dev, EVTCHNOP_close, &Close);\r
 }\r

diff --git a/OvmfPkg/XenBusDxe/GrantTable.c b/OvmfPkg/XenBusDxe/GrantTable.c
index f68a8542b5f346d1b96ab6b8846cf4853843cb89..37d3bf786c6485ae5a02ec8c4abec7ffd0767f09 100644 (file)
--- a/OvmfPkg/XenBusDxe/GrantTable.c
+++ b/OvmfPkg/XenBusDxe/GrantTable.c
@@ -101,7 +101,7 @@ XenGrantTableGrantAccess (
 \r
   ASSERT (GrantTable != NULL);\r
   Ref = XenGrantTableGetFreeEntry ();\r
-  GrantTable[Ref].frame = Frame;\r
+  GrantTable[Ref].frame = (UINT32)Frame;\r
   GrantTable[Ref].domid = DomainId;\r
   MemoryFence ();\r
   Flags = GTF_permit_access;\r
@@ -152,7 +152,7 @@ XenGrantTableInit (
 #endif\r
   EfiInitializeLock (&mGrantListLock, TPL_NOTIFY);\r
   for (Index = NR_RESERVED_ENTRIES; Index < NR_GRANT_ENTRIES; Index++) {\r
-    XenGrantTablePutFreeEntry (Index);\r
+    XenGrantTablePutFreeEntry ((grant_ref_t)Index);\r
   }\r
 \r
   GrantTable = (VOID*)(UINTN) MmioAddr;\r

diff --git a/OvmfPkg/XenBusDxe/XenBus.c b/OvmfPkg/XenBusDxe/XenBus.c
index a7350586b35a3fe50d7796db9bfa12c674f91c49..f69c27dd184a1272a03ccbfa8dd85849f0452e3a 100644 (file)
--- a/OvmfPkg/XenBusDxe/XenBus.c
+++ b/OvmfPkg/XenBusDxe/XenBus.c
@@ -182,7 +182,7 @@ XenBusAddDevice (
     Private->XenBusIo.Type = AsciiStrDup (Type);\r
     Private->XenBusIo.Node = AsciiStrDup (DevicePath);\r
     Private->XenBusIo.Backend = BackendPath;\r
-    Private->XenBusIo.DeviceId = AsciiStrDecimalToUintn (Id);\r
+    Private->XenBusIo.DeviceId = (UINT16)AsciiStrDecimalToUintn (Id);\r
     Private->Dev = Dev;\r
 \r
     TempXenBusPath = AllocateCopyPool (sizeof (XENBUS_DEVICE_PATH),\r
@@ -274,7 +274,7 @@ XenBusEnumerateDeviceType (
     XenBusAddDevice (Dev, Type, Directory[Index]);\r
   }\r
 \r
-  FreePool (Directory);\r
+  FreePool ((VOID*)Directory);\r
 }\r
 \r
 \r
@@ -310,7 +310,7 @@ XenBusEnumerateBus (
     XenBusEnumerateDeviceType (Dev, Types[Index]);\r
   }\r
 \r
-  FreePool (Types);\r
+  FreePool ((VOID*)Types);\r
 \r
   return XENSTORE_STATUS_SUCCESS;\r
 }\r

diff --git a/OvmfPkg/XenBusDxe/XenHypercall.c b/OvmfPkg/XenBusDxe/XenHypercall.c
index 15e9e1c799a814b84e08e7db11b4ce638992f1e1..34d92e76b7e38d24d670be41d3da12e963cbeda7 100644 (file)
--- a/OvmfPkg/XenBusDxe/XenHypercall.c
+++ b/OvmfPkg/XenBusDxe/XenHypercall.c
@@ -53,7 +53,7 @@ XenHypercallHvmGetParam (
 \r
   Parameter.domid = DOMID_SELF;\r
   Parameter.index = Index;\r
-  Error = XenHypercall2 (Dev->Hyperpage + __HYPERVISOR_hvm_op * 32,\r
+  Error = XenHypercall2 ((UINT8*)Dev->Hyperpage + __HYPERVISOR_hvm_op * 32,\r
                          HVMOP_get_param, (INTN) &Parameter);\r
   if (Error != 0) {\r
     DEBUG ((EFI_D_ERROR,\r
@@ -72,7 +72,7 @@ XenHypercallMemoryOp (
   )\r
 {\r
   ASSERT (Dev->Hyperpage != NULL);\r
-  return XenHypercall2 (Dev->Hyperpage + __HYPERVISOR_memory_op * 32,\r
+  return XenHypercall2 ((UINT8*)Dev->Hyperpage + __HYPERVISOR_memory_op * 32,\r
                         Operation, (INTN) Arguments);\r
 }\r
 \r
@@ -84,7 +84,7 @@ XenHypercallEventChannelOp (
   )\r
 {\r
   ASSERT (Dev->Hyperpage != NULL);\r
-  return XenHypercall2 (Dev->Hyperpage + __HYPERVISOR_event_channel_op * 32,\r
+  return XenHypercall2 ((UINT8*)Dev->Hyperpage + __HYPERVISOR_event_channel_op * 32,\r
                         Operation, (INTN) Arguments);\r
 }\r
 \r

diff --git a/OvmfPkg/XenBusDxe/XenStore.c b/OvmfPkg/XenBusDxe/XenStore.c
index 7c272b36efeaa034b4a1494b06d512e663f6e147..2df8f534858518d4174949115fb1492fb0335a33 100644 (file)
--- a/OvmfPkg/XenBusDxe/XenStore.c
+++ b/OvmfPkg/XenBusDxe/XenStore.c
@@ -248,7 +248,7 @@ Split (
 \r
   /* Transfer to one big alloc for easy freeing by the caller. */\r
   Dst = AllocatePool (*NumPtr * sizeof (CHAR8 *) + Len);\r
-  CopyMem (&Dst[*NumPtr], Strings, Len);\r
+  CopyMem ((VOID*)&Dst[*NumPtr], Strings, Len);\r
   FreePool (Strings);\r
 \r
   /* Extract pointers to newly allocated array. */\r
@@ -660,7 +660,7 @@ XenStoreProcessMessage (
     } else {\r
       DEBUG ((EFI_D_WARN, "XenStore: Watch handle %a not found\n",\r
               Message->u.Watch.Vector[XS_WATCH_TOKEN]));\r
-      FreePool(Message->u.Watch.Vector);\r
+      FreePool((VOID*)Message->u.Watch.Vector);\r
       FreePool(Message);\r
     }\r
     EfiReleaseLock (&xs.RegisteredWatchesLock);\r
@@ -829,7 +829,7 @@ XenStoreTalkv (
     }\r
   }\r
 \r
-  Status = XenStoreReadReply (&Message.type, LenPtr, &Return);\r
+  Status = XenStoreReadReply ((enum xsd_sockmsg_type *)&Message.type, LenPtr, &Return);\r
 \r
 Error:\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
@@ -843,7 +843,7 @@ Error:
   }\r
 \r
   /* Reply is either error or an echo of our request message type. */\r
-  ASSERT (Message.type == RequestType);\r
+  ASSERT ((enum xsd_sockmsg_type)Message.type == RequestType);\r
 \r
   if (ResultPtr) {\r
     *ResultPtr = Return;\r
@@ -975,7 +975,7 @@ XenStoreWaitWatch (
       if (Message->u.Watch.Handle == Token) {\r
         RemoveEntryList (Entry);\r
         EfiReleaseLock (&xs.WatchEventsLock);\r
-        FreePool(Message->u.Watch.Vector);\r
+        FreePool((VOID*)Message->u.Watch.Vector);\r
         FreePool(Message);\r
         return XENSTORE_STATUS_SUCCESS;\r
       }\r
@@ -1057,8 +1057,8 @@ XenStoreInit (
 \r
   xs.Dev = Dev;\r
 \r
-  xs.EventChannel = XenHypercallHvmGetParam (Dev, HVM_PARAM_STORE_EVTCHN);\r
-  XenStoreGpfn = XenHypercallHvmGetParam (Dev, HVM_PARAM_STORE_PFN);\r
+  xs.EventChannel = (evtchn_port_t)XenHypercallHvmGetParam (Dev, HVM_PARAM_STORE_EVTCHN);\r
+  XenStoreGpfn = (UINTN)XenHypercallHvmGetParam (Dev, HVM_PARAM_STORE_PFN);\r
   xs.XenStore = (VOID *) (XenStoreGpfn << EFI_PAGE_SHIFT);\r
   DEBUG ((EFI_D_INFO, "XenBusInit: XenBus rings @%p, event channel %x\n",\r
           xs.XenStore, xs.EventChannel));\r
@@ -1115,7 +1115,7 @@ XenStoreDeinit (
       XENSTORE_MESSAGE *Message = XENSTORE_MESSAGE_FROM_LINK (Entry);\r
       Entry = GetNextNode (&xs.WatchEvents, Entry);\r
       RemoveEntryList (&Message->Link);\r
-      FreePool (Message->u.Watch.Vector);\r
+      FreePool ((VOID*)Message->u.Watch.Vector);\r
       FreePool (Message);\r
     }\r
   }\r
@@ -1202,7 +1202,7 @@ XenStorePathExists (
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     return FALSE;\r
   }\r
-  FreePool (TempStr);\r
+  FreePool ((VOID*)TempStr);\r
   return TRUE;\r
 }\r
 \r
@@ -1283,7 +1283,7 @@ XenStoreTransactionStart (
   Status = XenStoreSingle (XST_NIL, XS_TRANSACTION_START, "", NULL,\r
                            (VOID **) &IdStr);\r
   if (Status == XENSTORE_STATUS_SUCCESS) {\r
-    Transaction->Id = AsciiStrDecimalToUintn (IdStr);\r
+    Transaction->Id = (UINT32)AsciiStrDecimalToUintn (IdStr);\r
     FreePool (IdStr);\r
   }\r
 \r
@@ -1419,7 +1419,7 @@ XenStoreUnregisterWatch (
     Entry = GetNextNode (&xs.WatchEvents, Entry);\r
     if (Message->u.Watch.Handle == Watch) {\r
       RemoveEntryList (&Message->Link);\r
-      FreePool (Message->u.Watch.Vector);\r
+      FreePool ((VOID*)Message->u.Watch.Vector);\r
       FreePool (Message);\r
     }\r
   }\r