sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OvmfPkg: Fix VS2015 warning C4459 in XenBusDxe

Browse Source 
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 <liming.gao@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Acked-by: Michael Kinney <michael.d.kinney@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19116 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Liming Gao 2015-12-04 03:16:37 +00:00 committed by lgao4
parent 0f397749e1
commit 17247f53d5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OvmfPkg/XenBusDxe/XenStore.c
View File

@ -992,9 +992,9 @@ NotifyEventChannelCheckForEvent (
IN VOID *Context IN VOID *Context
) )
{ {
XENSTORE_PRIVATE *xs; XENSTORE_PRIVATE *xsp;
xs = (XENSTORE_PRIVATE *)Context; xsp = (XENSTORE_PRIVATE *)Context;
if (TestAndClearBit (xs->EventChannel, xs->Dev->SharedInfo->evtchn_pending)) { if (TestAndClearBit (xsp->EventChannel, xsp->Dev->SharedInfo->evtchn_pending)) {
gBS->SignalEvent (Event); gBS->SignalEvent (Event);
} }
} }
@ -1007,12 +1007,12 @@ NotifyEventChannelCheckForEvent (
STATIC STATIC
EFI_STATUS EFI_STATUS
XenStoreInitComms ( XenStoreInitComms (
XENSTORE_PRIVATE *xs XENSTORE_PRIVATE *xsp
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
EFI_EVENT TimerEvent; 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->CreateEvent (EVT_TIMER, 0, NULL, NULL, &TimerEvent);
Status = gBS->SetTimer (TimerEvent, TimerRelative, Status = gBS->SetTimer (TimerEvent, TimerRelative,
@ -1029,8 +1029,8 @@ XenStoreInitComms (
gBS->CloseEvent (TimerEvent); gBS->CloseEvent (TimerEvent);
Status = gBS->CreateEvent (EVT_NOTIFY_WAIT, TPL_NOTIFY, Status = gBS->CreateEvent (EVT_NOTIFY_WAIT, TPL_NOTIFY,
NotifyEventChannelCheckForEvent, xs, NotifyEventChannelCheckForEvent, xsp,
&xs->EventChannelEvent); &xsp->EventChannelEvent);
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
return Status; return Status;