Revision: 16392
http://sourceforge.net/p/edk2/code/16392
Author: lersek
Date: 2014-11-14 17:35:35 +0000 (Fri, 14 Nov 2014)
Log Message:
-----------
OvmfPkg/XenBusDxe: fix VS2010 build failures
This patch contain only type cast.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Scott Duplichan <[email protected]>
Signed-off-by: Anthony PERARD <[email protected]>
Build-tested-by: Scott Duplichan <[email protected]>
Acked-by: Laszlo Ersek <[email protected]>
Modified Paths:
--------------
trunk/edk2/OvmfPkg/XenBusDxe/EventChannel.c
trunk/edk2/OvmfPkg/XenBusDxe/GrantTable.c
trunk/edk2/OvmfPkg/XenBusDxe/XenBus.c
trunk/edk2/OvmfPkg/XenBusDxe/XenHypercall.c
trunk/edk2/OvmfPkg/XenBusDxe/XenStore.c
Modified: trunk/edk2/OvmfPkg/XenBusDxe/EventChannel.c
===================================================================
--- trunk/edk2/OvmfPkg/XenBusDxe/EventChannel.c 2014-11-14 17:35:29 UTC (rev
16391)
+++ trunk/edk2/OvmfPkg/XenBusDxe/EventChannel.c 2014-11-14 17:35:35 UTC (rev
16392)
@@ -29,7 +29,7 @@
Send.port = Port;
ReturnCode = XenHypercallEventChannelOp (Dev, EVTCHNOP_send, &Send);
- return ReturnCode;
+ return (UINT32)ReturnCode;
}
UINT32
@@ -48,7 +48,7 @@
Parameter.dom = DOMID_SELF;
Parameter.remote_dom = DomainId;
- ReturnCode = XenHypercallEventChannelOp (Private->Dev,
+ ReturnCode = (UINT32)XenHypercallEventChannelOp (Private->Dev,
EVTCHNOP_alloc_unbound,
&Parameter);
if (ReturnCode != 0) {
@@ -84,5 +84,5 @@
Private = XENBUS_PRIVATE_DATA_FROM_THIS (This);
Close.port = Port;
- return XenHypercallEventChannelOp (Private->Dev, EVTCHNOP_close, &Close);
+ return (UINT32)XenHypercallEventChannelOp (Private->Dev, EVTCHNOP_close,
&Close);
}
Modified: trunk/edk2/OvmfPkg/XenBusDxe/GrantTable.c
===================================================================
--- trunk/edk2/OvmfPkg/XenBusDxe/GrantTable.c 2014-11-14 17:35:29 UTC (rev
16391)
+++ trunk/edk2/OvmfPkg/XenBusDxe/GrantTable.c 2014-11-14 17:35:35 UTC (rev
16392)
@@ -101,7 +101,7 @@
ASSERT (GrantTable != NULL);
Ref = XenGrantTableGetFreeEntry ();
- GrantTable[Ref].frame = Frame;
+ GrantTable[Ref].frame = (UINT32)Frame;
GrantTable[Ref].domid = DomainId;
MemoryFence ();
Flags = GTF_permit_access;
@@ -152,7 +152,7 @@
#endif
EfiInitializeLock (&mGrantListLock, TPL_NOTIFY);
for (Index = NR_RESERVED_ENTRIES; Index < NR_GRANT_ENTRIES; Index++) {
- XenGrantTablePutFreeEntry (Index);
+ XenGrantTablePutFreeEntry ((grant_ref_t)Index);
}
GrantTable = (VOID*)(UINTN) MmioAddr;
Modified: trunk/edk2/OvmfPkg/XenBusDxe/XenBus.c
===================================================================
--- trunk/edk2/OvmfPkg/XenBusDxe/XenBus.c 2014-11-14 17:35:29 UTC (rev
16391)
+++ trunk/edk2/OvmfPkg/XenBusDxe/XenBus.c 2014-11-14 17:35:35 UTC (rev
16392)
@@ -182,7 +182,7 @@
Private->XenBusIo.Type = AsciiStrDup (Type);
Private->XenBusIo.Node = AsciiStrDup (DevicePath);
Private->XenBusIo.Backend = BackendPath;
- Private->XenBusIo.DeviceId = AsciiStrDecimalToUintn (Id);
+ Private->XenBusIo.DeviceId = (UINT16)AsciiStrDecimalToUintn (Id);
Private->Dev = Dev;
TempXenBusPath = AllocateCopyPool (sizeof (XENBUS_DEVICE_PATH),
@@ -274,7 +274,7 @@
XenBusAddDevice (Dev, Type, Directory[Index]);
}
- FreePool (Directory);
+ FreePool ((VOID*)Directory);
}
@@ -310,7 +310,7 @@
XenBusEnumerateDeviceType (Dev, Types[Index]);
}
- FreePool (Types);
+ FreePool ((VOID*)Types);
return XENSTORE_STATUS_SUCCESS;
}
Modified: trunk/edk2/OvmfPkg/XenBusDxe/XenHypercall.c
===================================================================
--- trunk/edk2/OvmfPkg/XenBusDxe/XenHypercall.c 2014-11-14 17:35:29 UTC (rev
16391)
+++ trunk/edk2/OvmfPkg/XenBusDxe/XenHypercall.c 2014-11-14 17:35:35 UTC (rev
16392)
@@ -53,7 +53,7 @@
Parameter.domid = DOMID_SELF;
Parameter.index = Index;
- Error = XenHypercall2 (Dev->Hyperpage + __HYPERVISOR_hvm_op * 32,
+ Error = XenHypercall2 ((UINT8*)Dev->Hyperpage + __HYPERVISOR_hvm_op * 32,
HVMOP_get_param, (INTN) &Parameter);
if (Error != 0) {
DEBUG ((EFI_D_ERROR,
@@ -72,7 +72,7 @@
)
{
ASSERT (Dev->Hyperpage != NULL);
- return XenHypercall2 (Dev->Hyperpage + __HYPERVISOR_memory_op * 32,
+ return XenHypercall2 ((UINT8*)Dev->Hyperpage + __HYPERVISOR_memory_op * 32,
Operation, (INTN) Arguments);
}
@@ -84,7 +84,7 @@
)
{
ASSERT (Dev->Hyperpage != NULL);
- return XenHypercall2 (Dev->Hyperpage + __HYPERVISOR_event_channel_op * 32,
+ return XenHypercall2 ((UINT8*)Dev->Hyperpage + __HYPERVISOR_event_channel_op
* 32,
Operation, (INTN) Arguments);
}
Modified: trunk/edk2/OvmfPkg/XenBusDxe/XenStore.c
===================================================================
--- trunk/edk2/OvmfPkg/XenBusDxe/XenStore.c 2014-11-14 17:35:29 UTC (rev
16391)
+++ trunk/edk2/OvmfPkg/XenBusDxe/XenStore.c 2014-11-14 17:35:35 UTC (rev
16392)
@@ -248,7 +248,7 @@
/* Transfer to one big alloc for easy freeing by the caller. */
Dst = AllocatePool (*NumPtr * sizeof (CHAR8 *) + Len);
- CopyMem (&Dst[*NumPtr], Strings, Len);
+ CopyMem ((VOID*)&Dst[*NumPtr], Strings, Len);
FreePool (Strings);
/* Extract pointers to newly allocated array. */
@@ -660,7 +660,7 @@
} else {
DEBUG ((EFI_D_WARN, "XenStore: Watch handle %a not found\n",
Message->u.Watch.Vector[XS_WATCH_TOKEN]));
- FreePool(Message->u.Watch.Vector);
+ FreePool((VOID*)Message->u.Watch.Vector);
FreePool(Message);
}
EfiReleaseLock (&xs.RegisteredWatchesLock);
@@ -829,7 +829,7 @@
}
}
- Status = XenStoreReadReply (&Message.type, LenPtr, &Return);
+ Status = XenStoreReadReply ((enum xsd_sockmsg_type *)&Message.type, LenPtr,
&Return);
Error:
if (Status != XENSTORE_STATUS_SUCCESS) {
@@ -843,7 +843,7 @@
}
/* Reply is either error or an echo of our request message type. */
- ASSERT (Message.type == RequestType);
+ ASSERT ((enum xsd_sockmsg_type)Message.type == RequestType);
if (ResultPtr) {
*ResultPtr = Return;
@@ -975,7 +975,7 @@
if (Message->u.Watch.Handle == Token) {
RemoveEntryList (Entry);
EfiReleaseLock (&xs.WatchEventsLock);
- FreePool(Message->u.Watch.Vector);
+ FreePool((VOID*)Message->u.Watch.Vector);
FreePool(Message);
return XENSTORE_STATUS_SUCCESS;
}
@@ -1057,8 +1057,8 @@
xs.Dev = Dev;
- xs.EventChannel = XenHypercallHvmGetParam (Dev, HVM_PARAM_STORE_EVTCHN);
- XenStoreGpfn = XenHypercallHvmGetParam (Dev, HVM_PARAM_STORE_PFN);
+ xs.EventChannel = (evtchn_port_t)XenHypercallHvmGetParam (Dev,
HVM_PARAM_STORE_EVTCHN);
+ XenStoreGpfn = (UINTN)XenHypercallHvmGetParam (Dev, HVM_PARAM_STORE_PFN);
xs.XenStore = (VOID *) (XenStoreGpfn << EFI_PAGE_SHIFT);
DEBUG ((EFI_D_INFO, "XenBusInit: XenBus rings @%p, event channel %x\n",
xs.XenStore, xs.EventChannel));
@@ -1115,7 +1115,7 @@
XENSTORE_MESSAGE *Message = XENSTORE_MESSAGE_FROM_LINK (Entry);
Entry = GetNextNode (&xs.WatchEvents, Entry);
RemoveEntryList (&Message->Link);
- FreePool (Message->u.Watch.Vector);
+ FreePool ((VOID*)Message->u.Watch.Vector);
FreePool (Message);
}
}
@@ -1202,7 +1202,7 @@
if (Status != XENSTORE_STATUS_SUCCESS) {
return FALSE;
}
- FreePool (TempStr);
+ FreePool ((VOID*)TempStr);
return TRUE;
}
@@ -1283,7 +1283,7 @@
Status = XenStoreSingle (XST_NIL, XS_TRANSACTION_START, "", NULL,
(VOID **) &IdStr);
if (Status == XENSTORE_STATUS_SUCCESS) {
- Transaction->Id = AsciiStrDecimalToUintn (IdStr);
+ Transaction->Id = (UINT32)AsciiStrDecimalToUintn (IdStr);
FreePool (IdStr);
}
@@ -1419,7 +1419,7 @@
Entry = GetNextNode (&xs.WatchEvents, Entry);
if (Message->u.Watch.Handle == Watch) {
RemoveEntryList (&Message->Link);
- FreePool (Message->u.Watch.Vector);
+ FreePool ((VOID*)Message->u.Watch.Vector);
FreePool (Message);
}
}
------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
