NetworkPkg: Removing or adding some ASSERT statement

[mirror_edk2.git] / OvmfPkg / XenBusDxe / XenStore.c

diff --git a/OvmfPkg/XenBusDxe/XenStore.c b/OvmfPkg/XenBusDxe/XenStore.c
index 2df8f534858518d4174949115fb1492fb0335a33..61976f91f11b7f7b4024a93dd81f7c3405081eb1 100644 (file)
--- a/OvmfPkg/XenBusDxe/XenStore.c
+++ b/OvmfPkg/XenBusDxe/XenStore.c
@@ -60,8 +60,8 @@
 \r
 #include <IndustryStandard/Xen/hvm/params.h>\r
 \r
-#include "XenHypercall.h"\r
 #include "EventChannel.h"\r
+#include <Library/XenHypercallLib.h>\r
 \r
 //\r
 // Private Data Structures\r
@@ -992,9 +992,9 @@ NotifyEventChannelCheckForEvent (
   IN VOID *Context\r
   )\r
 {\r
-  XENSTORE_PRIVATE *xs;\r
-  xs = (XENSTORE_PRIVATE *)Context;\r
-  if (TestAndClearBit (xs->EventChannel, xs->Dev->SharedInfo->evtchn_pending)) {\r
+  XENSTORE_PRIVATE *xsp;\r
+  xsp = (XENSTORE_PRIVATE *)Context;\r
+  if (TestAndClearBit (xsp->EventChannel, xsp->Dev->SharedInfo->evtchn_pending)) {\r
     gBS->SignalEvent (Event);\r
   }\r
 }\r
@@ -1007,12 +1007,12 @@ NotifyEventChannelCheckForEvent (
 STATIC\r
 EFI_STATUS\r
 XenStoreInitComms (\r
-  XENSTORE_PRIVATE *xs\r
+  XENSTORE_PRIVATE *xsp\r
   )\r
 {\r
   EFI_STATUS Status;\r
   EFI_EVENT TimerEvent;\r
-  struct xenstore_domain_interface *XenStore = xs->XenStore;\r
+  struct xenstore_domain_interface *XenStore = xsp->XenStore;\r
 \r
   Status = gBS->CreateEvent (EVT_TIMER, 0, NULL, NULL, &TimerEvent);\r
   Status = gBS->SetTimer (TimerEvent, TimerRelative,\r
@@ -1029,8 +1029,8 @@ XenStoreInitComms (
   gBS->CloseEvent (TimerEvent);\r
 \r
   Status = gBS->CreateEvent (EVT_NOTIFY_WAIT, TPL_NOTIFY,\r
-                             NotifyEventChannelCheckForEvent, xs,\r
-                             &xs->EventChannelEvent);\r
+                             NotifyEventChannelCheckForEvent, xsp,\r
+                             &xsp->EventChannelEvent);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return Status;\r
@@ -1057,8 +1057,8 @@ XenStoreInit (
 \r
   xs.Dev = Dev;\r
 \r
-  xs.EventChannel = (evtchn_port_t)XenHypercallHvmGetParam (Dev, HVM_PARAM_STORE_EVTCHN);\r
-  XenStoreGpfn = (UINTN)XenHypercallHvmGetParam (Dev, HVM_PARAM_STORE_PFN);\r
+  xs.EventChannel = (evtchn_port_t)XenHypercallHvmGetParam (HVM_PARAM_STORE_EVTCHN);\r
+  XenStoreGpfn = (UINTN)XenHypercallHvmGetParam (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