Ovmf/Xen: refactor XenBusDxe hypercall implementation

This refactors the Xen hypercall implementation that is part of the
XenBusDxe driver, in preparation of splitting it off entirely into
a XenHypercallLib library. This involves:
- removing the dependency on XENBUS_DEVICE* pointers in the XenHypercall()
  prototypes
- moving the discovered hyperpage address to a global variable
- moving XenGetSharedInfoPage() to its only user XenBusDxe.c (the shared info
  page is not strictly part of the Xen hypercall interface, and is not used
  by other expected users of XenHypercallLib such as the Xen console version
  of SerialPortLib
- reimplement XenHypercall2() in C and move the indexing of the hyperpage
  there; the existing asm implementations are renamed to __XenHypercall2() and
  invoked from the new C implementation.

Contributed-under: TianoCore Contribution Agreement 1.0
Acked-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16969 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 3 insertions, 8 deletions

diff --git a/OvmfPkg/XenBusDxe/EventChannel.c b/OvmfPkg/XenBusDxe/EventChannel.c
index 03efaf9cb9..a86323e6ad 100644
--- a/OvmfPkg/XenBusDxe/EventChannel.c
+++ b/OvmfPkg/XenBusDxe/EventChannel.c
@@ -28,7 +28,7 @@ XenEventChannelNotify (
   evtchn_send_t Send;

 

   Send.port = Port;

-  ReturnCode = XenHypercallEventChannelOp (Dev, EVTCHNOP_send, &Send);

+  ReturnCode = XenHypercallEventChannelOp (EVTCHNOP_send, &Send);

   return (UINT32)ReturnCode;

 }

 

@@ -40,15 +40,12 @@ XenBusEventChannelAllocate (
   OUT evtchn_port_t   *Port

   )

 {

-  XENBUS_PRIVATE_DATA *Private;

   evtchn_alloc_unbound_t Parameter;

   UINT32 ReturnCode;

 

-  Private = XENBUS_PRIVATE_DATA_FROM_THIS (This);

-

   Parameter.dom = DOMID_SELF;

   Parameter.remote_dom = DomainId;

-  ReturnCode = (UINT32)XenHypercallEventChannelOp (Private->Dev,

+  ReturnCode = (UINT32)XenHypercallEventChannelOp (

                                    EVTCHNOP_alloc_unbound,

                                    &Parameter);

   if (ReturnCode != 0) {

@@ -79,10 +76,8 @@ XenBusEventChannelClose (
   IN evtchn_port_t   Port

   )

 {

-  XENBUS_PRIVATE_DATA *Private;

   evtchn_close_t Close;

 

-  Private = XENBUS_PRIVATE_DATA_FROM_THIS (This);

   Close.port = Port;

-  return (UINT32)XenHypercallEventChannelOp (Private->Dev, EVTCHNOP_close, &Close);

+  return (UINT32)XenHypercallEventChannelOp (EVTCHNOP_close, &Close);

 }