Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com>
On 2015-12-02 21:26:46, Liming Gao wrote:
> 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....@intel.com>
> Cc: Justen Jordan <jordan.l.jus...@intel.com>
> ---
> OvmfPkg/XenBusDxe/XenStore.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/OvmfPkg/XenBusDxe/XenStore.c b/OvmfPkg/XenBusDxe/XenStore.c
> index 9850f1e..61976f9 100644
> --- a/OvmfPkg/XenBusDxe/XenStore.c
> +++ b/OvmfPkg/XenBusDxe/XenStore.c
> @@ -992,9 +992,9 @@ NotifyEventChannelCheckForEvent (
> 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 @@ NotifyEventChannelCheckForEvent (
> 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 @@ XenStoreInitComms (
> 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;
> --
> 1.9.5.msysgit.0
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
