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
\r
Send.port = Port;\r
ReturnCode = XenHypercallEventChannelOp (Dev, EVTCHNOP_send, &Send);\r
\r
Send.port = Port;\r
ReturnCode = XenHypercallEventChannelOp (Dev, EVTCHNOP_send, &Send);\r
+ return (UINT32)ReturnCode;\r
\r
Parameter.dom = DOMID_SELF;\r
Parameter.remote_dom = DomainId;\r
\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
EVTCHNOP_alloc_unbound,\r
&Parameter);\r
if (ReturnCode != 0) {\r
\r
Private = XENBUS_PRIVATE_DATA_FROM_THIS (This);\r
Close.port = Port;\r
\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
ASSERT (GrantTable != NULL);\r
Ref = XenGrantTableGetFreeEntry ();\r
\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
GrantTable[Ref].domid = DomainId;\r
MemoryFence ();\r
Flags = GTF_permit_access;\r
#endif\r
EfiInitializeLock (&mGrantListLock, TPL_NOTIFY);\r
for (Index = NR_RESERVED_ENTRIES; Index < NR_GRANT_ENTRIES; Index++) {\r
#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
}\r
\r
GrantTable = (VOID*)(UINTN) MmioAddr;\r
Private->XenBusIo.Type = AsciiStrDup (Type);\r
Private->XenBusIo.Node = AsciiStrDup (DevicePath);\r
Private->XenBusIo.Backend = BackendPath;\r
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
Private->Dev = Dev;\r
\r
TempXenBusPath = AllocateCopyPool (sizeof (XENBUS_DEVICE_PATH),\r
XenBusAddDevice (Dev, Type, Directory[Index]);\r
}\r
\r
XenBusAddDevice (Dev, Type, Directory[Index]);\r
}\r
\r
- FreePool (Directory);\r
+ FreePool ((VOID*)Directory);\r
XenBusEnumerateDeviceType (Dev, Types[Index]);\r
}\r
\r
XenBusEnumerateDeviceType (Dev, Types[Index]);\r
}\r
\r
+ FreePool ((VOID*)Types);\r
\r
return XENSTORE_STATUS_SUCCESS;\r
}\r
\r
return XENSTORE_STATUS_SUCCESS;\r
}\r
\r
Parameter.domid = DOMID_SELF;\r
Parameter.index = Index;\r
\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
HVMOP_get_param, (INTN) &Parameter);\r
if (Error != 0) {\r
DEBUG ((EFI_D_ERROR,\r
)\r
{\r
ASSERT (Dev->Hyperpage != NULL);\r
)\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
Operation, (INTN) Arguments);\r
}\r
\r
)\r
{\r
ASSERT (Dev->Hyperpage != NULL);\r
)\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
Operation, (INTN) Arguments);\r
}\r
\r
\r
/* Transfer to one big alloc for easy freeing by the caller. */\r
Dst = AllocatePool (*NumPtr * sizeof (CHAR8 *) + Len);\r
\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
FreePool (Strings);\r
\r
/* Extract pointers to newly allocated array. */\r
} else {\r
DEBUG ((EFI_D_WARN, "XenStore: Watch handle %a not found\n",\r
Message->u.Watch.Vector[XS_WATCH_TOKEN]));\r
} 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
FreePool(Message);\r
}\r
EfiReleaseLock (&xs.RegisteredWatchesLock);\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
\r
Error:\r
if (Status != XENSTORE_STATUS_SUCCESS) {\r
}\r
\r
/* Reply is either error or an echo of our request message type. */\r
}\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
\r
if (ResultPtr) {\r
*ResultPtr = Return;\r
if (Message->u.Watch.Handle == Token) {\r
RemoveEntryList (Entry);\r
EfiReleaseLock (&xs.WatchEventsLock);\r
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
FreePool(Message);\r
return XENSTORE_STATUS_SUCCESS;\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
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
XENSTORE_MESSAGE *Message = XENSTORE_MESSAGE_FROM_LINK (Entry);\r
Entry = GetNextNode (&xs.WatchEvents, Entry);\r
RemoveEntryList (&Message->Link);\r
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
FreePool (Message);\r
}\r
}\r
if (Status != XENSTORE_STATUS_SUCCESS) {\r
return FALSE;\r
}\r
if (Status != XENSTORE_STATUS_SUCCESS) {\r
return FALSE;\r
}\r
+ FreePool ((VOID*)TempStr);\r
Status = XenStoreSingle (XST_NIL, XS_TRANSACTION_START, "", NULL,\r
(VOID **) &IdStr);\r
if (Status == XENSTORE_STATUS_SUCCESS) {\r
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
FreePool (IdStr);\r
}\r
\r
Entry = GetNextNode (&xs.WatchEvents, Entry);\r
if (Message->u.Watch.Handle == Watch) {\r
RemoveEntryList (&Message->Link);\r
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
FreePool (Message);\r
}\r
}\r