Revision: 19116
http://sourceforge.net/p/edk2/code/19116
Author: lgao4
Date: 2015-12-04 03:16:37 +0000 (Fri, 04 Dec 2015)
Log Message:
-----------
OvmfPkg: Fix VS2015 warning C4459 in XenBusDxe
warning C4459: declaration of 'xs' hides global declaration.
Update code to rename local variable xs to xsp to be different.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Acked-by: Michael Kinney <[email protected]>
Modified Paths:
--------------
trunk/edk2/OvmfPkg/XenBusDxe/XenStore.c
Modified: trunk/edk2/OvmfPkg/XenBusDxe/XenStore.c
===================================================================
--- trunk/edk2/OvmfPkg/XenBusDxe/XenStore.c 2015-12-04 03:15:45 UTC (rev
19115)
+++ trunk/edk2/OvmfPkg/XenBusDxe/XenStore.c 2015-12-04 03:16:37 UTC (rev
19116)
@@ -992,9 +992,9 @@
IN VOID *Context
)
{
- XENSTORE_PRIVATE *xs;
- xs = (XENSTORE_PRIVATE *)Context;
- if (TestAndClearBit (xs->EventChannel, xs->Dev->SharedInfo->evtchn_pending))
{
+ XENSTORE_PRIVATE *xsp;
+ xsp = (XENSTORE_PRIVATE *)Context;
+ if (TestAndClearBit (xsp->EventChannel,
xsp->Dev->SharedInfo->evtchn_pending)) {
gBS->SignalEvent (Event);
}
}
@@ -1007,12 +1007,12 @@
STATIC
EFI_STATUS
XenStoreInitComms (
- XENSTORE_PRIVATE *xs
+ XENSTORE_PRIVATE *xsp
)
{
EFI_STATUS Status;
EFI_EVENT TimerEvent;
- struct xenstore_domain_interface *XenStore = xs->XenStore;
+ struct xenstore_domain_interface *XenStore = xsp->XenStore;
Status = gBS->CreateEvent (EVT_TIMER, 0, NULL, NULL, &TimerEvent);
Status = gBS->SetTimer (TimerEvent, TimerRelative,
@@ -1029,8 +1029,8 @@
gBS->CloseEvent (TimerEvent);
Status = gBS->CreateEvent (EVT_NOTIFY_WAIT, TPL_NOTIFY,
- NotifyEventChannelCheckForEvent, xs,
- &xs->EventChannelEvent);
+ NotifyEventChannelCheckForEvent, xsp,
+ &xsp->EventChannelEvent);
ASSERT_EFI_ERROR (Status);
return Status;
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741911&iu=/4140
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
