\r
The XenStore is ASCII string based, and has a structure and semantics\r
similar to a filesystem. There are files and directories, the directories\r
- able to contain files or other directories. The depth of the hierachy\r
+ able to contain files or other directories. The depth of the hierarchy\r
is only limited by the XenStore's maximum path length.\r
\r
The communication channel between the XenStore service and other\r
\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
\r
typedef struct {\r
CONST VOID *Data;\r
- UINTN Len;\r
+ UINT32 Len;\r
} WRITE_REQUEST;\r
\r
/* Register callback to watch subtree (node) in the XenStore. */\r
\r
/* Transfer to one big alloc for easy freeing by the caller. */\r
Dst = AllocatePool (*NumPtr * sizeof (CHAR8 *) + Len);\r
- CopyMem (&Dst[*NumPtr], Strings, Len);\r
+ CopyMem ((VOID*)&Dst[*NumPtr], Strings, Len);\r
FreePool (Strings);\r
\r
/* Extract pointers to newly allocated array. */\r
)\r
{\r
CHAR8 *Buf;\r
+ UINTN BufSize;\r
\r
/* +1 for '/' and +1 for '\0' */\r
- Buf = AllocateZeroPool (\r
- AsciiStrLen (DirectoryPath) + AsciiStrLen (Node) + 2);\r
- AsciiStrCat (Buf, DirectoryPath);\r
- if (Node[0] != '\0') {\r
- AsciiStrCat (Buf, "/");\r
- AsciiStrCat (Buf, Node);\r
+ BufSize = AsciiStrLen (DirectoryPath) + AsciiStrLen (Node) + 2;\r
+ Buf = AllocatePool (BufSize);\r
+ ASSERT (Buf != NULL);\r
+\r
+ if (Node[0] == '\0') {\r
+ AsciiSPrint (Buf, BufSize, "%a", DirectoryPath);\r
+ } else {\r
+ AsciiSPrint (Buf, BufSize, "%a/%a", DirectoryPath, Node);\r
}\r
\r
return Buf;\r
XENSTORE_STATUS\r
XenStoreWriteStore (\r
IN CONST VOID *DataPtr,\r
- IN UINTN Len\r
+ IN UINT32 Len\r
)\r
{\r
XENSTORE_RING_IDX Cons, Prod;\r
XENSTORE_STATUS\r
XenStoreReadStore (\r
OUT VOID *DataPtr,\r
- IN UINTN Len\r
+ IN UINT32 Len\r
)\r
{\r
XENSTORE_RING_IDX Cons, Prod;\r
} else {\r
DEBUG ((EFI_D_WARN, "XenStore: Watch handle %a not found\n",\r
Message->u.Watch.Vector[XS_WATCH_TOKEN]));\r
- FreePool(Message->u.Watch.Vector);\r
+ FreePool((VOID*)Message->u.Watch.Vector);\r
FreePool(Message);\r
}\r
EfiReleaseLock (&xs.RegisteredWatchesLock);\r
{ XENSTORE_STATUS_EISCONN, "EISCONN" },\r
{ XENSTORE_STATUS_E2BIG, "E2BIG" }\r
};\r
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))\r
\r
STATIC\r
XENSTORE_STATUS\r
STATIC\r
XENSTORE_STATUS\r
XenStoreTalkv (\r
- IN XENSTORE_TRANSACTION Transaction,\r
+ IN CONST XENSTORE_TRANSACTION *Transaction,\r
IN enum xsd_sockmsg_type RequestType,\r
IN CONST WRITE_REQUEST *WriteRequest,\r
IN UINT32 NumRequests,\r
UINT32 Index;\r
XENSTORE_STATUS Status;\r
\r
- Message.tx_id = Transaction.Id;\r
+ if (Transaction == XST_NIL) {\r
+ Message.tx_id = 0;\r
+ } else {\r
+ Message.tx_id = Transaction->Id;\r
+ }\r
Message.req_id = 0;\r
Message.type = RequestType;\r
Message.len = 0;\r
}\r
}\r
\r
- Status = XenStoreReadReply (&Message.type, LenPtr, &Return);\r
+ Status = XenStoreReadReply ((enum xsd_sockmsg_type *)&Message.type, LenPtr, &Return);\r
\r
Error:\r
if (Status != XENSTORE_STATUS_SUCCESS) {\r
}\r
\r
/* Reply is either error or an echo of our request message type. */\r
- ASSERT (Message.type == RequestType);\r
+ ASSERT ((enum xsd_sockmsg_type)Message.type == RequestType);\r
\r
if (ResultPtr) {\r
*ResultPtr = Return;\r
STATIC\r
XENSTORE_STATUS\r
XenStoreSingle (\r
- IN XENSTORE_TRANSACTION Transaction,\r
+ IN CONST XENSTORE_TRANSACTION *Transaction,\r
IN enum xsd_sockmsg_type RequestType,\r
IN CONST CHAR8 *Body,\r
OUT UINT32 *LenPtr OPTIONAL,\r
WRITE_REQUEST WriteRequest;\r
\r
WriteRequest.Data = (VOID *) Body;\r
- WriteRequest.Len = AsciiStrSize (Body);\r
+ WriteRequest.Len = (UINT32)AsciiStrSize (Body);\r
\r
return XenStoreTalkv (Transaction, RequestType, &WriteRequest, 1,\r
LenPtr, Result);\r
WRITE_REQUEST WriteRequest[2];\r
\r
WriteRequest[0].Data = (VOID *) Path;\r
- WriteRequest[0].Len = AsciiStrSize (Path);\r
+ WriteRequest[0].Len = (UINT32)AsciiStrSize (Path);\r
WriteRequest[1].Data = (VOID *) Token;\r
- WriteRequest[1].Len = AsciiStrSize (Token);\r
+ WriteRequest[1].Len = (UINT32)AsciiStrSize (Token);\r
\r
return XenStoreTalkv (XST_NIL, XS_WATCH, WriteRequest, 2, NULL, NULL);\r
}\r
WRITE_REQUEST WriteRequest[2];\r
\r
WriteRequest[0].Data = (VOID *) Path;\r
- WriteRequest[0].Len = AsciiStrSize (Path);\r
+ WriteRequest[0].Len = (UINT32)AsciiStrSize (Path);\r
WriteRequest[1].Data = (VOID *) Token;\r
- WriteRequest[1].Len = AsciiStrSize (Token);\r
+ WriteRequest[1].Len = (UINT32)AsciiStrSize (Token);\r
\r
return XenStoreTalkv (XST_NIL, XS_UNWATCH, WriteRequest, 2, NULL, NULL);\r
}\r
if (Message->u.Watch.Handle == Token) {\r
RemoveEntryList (Entry);\r
EfiReleaseLock (&xs.WatchEventsLock);\r
- FreePool(Message->u.Watch.Vector);\r
+ FreePool((VOID*)Message->u.Watch.Vector);\r
FreePool(Message);\r
return XENSTORE_STATUS_SUCCESS;\r
}\r
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
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
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
\r
xs.Dev = Dev;\r
\r
- xs.EventChannel = XenHypercallHvmGetParam (Dev, HVM_PARAM_STORE_EVTCHN);\r
- XenStoreGpfn = 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
\r
/* Initialize the shared memory rings to talk to xenstored */\r
Status = XenStoreInitComms (&xs);\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
- }\r
\r
return Status;\r
}\r
XENSTORE_MESSAGE *Message = XENSTORE_MESSAGE_FROM_LINK (Entry);\r
Entry = GetNextNode (&xs.WatchEvents, Entry);\r
RemoveEntryList (&Message->Link);\r
- FreePool (Message->u.Watch.Vector);\r
+ FreePool ((VOID*)Message->u.Watch.Vector);\r
FreePool (Message);\r
}\r
}\r
\r
XENSTORE_STATUS\r
XenStoreListDirectory (\r
- IN XENSTORE_TRANSACTION Transaction,\r
+ IN CONST XENSTORE_TRANSACTION *Transaction,\r
IN CONST CHAR8 *DirectoryPath,\r
IN CONST CHAR8 *Node,\r
OUT UINT32 *DirectoryCountPtr,\r
\r
BOOLEAN\r
XenStorePathExists (\r
- IN XENSTORE_TRANSACTION Transaction,\r
+ IN CONST XENSTORE_TRANSACTION *Transaction,\r
IN CONST CHAR8 *Directory,\r
IN CONST CHAR8 *Node\r
)\r
if (Status != XENSTORE_STATUS_SUCCESS) {\r
return FALSE;\r
}\r
- FreePool (TempStr);\r
+ FreePool ((VOID*)TempStr);\r
return TRUE;\r
}\r
\r
XENSTORE_STATUS\r
XenStoreRead (\r
- IN XENSTORE_TRANSACTION Transaction,\r
+ IN CONST XENSTORE_TRANSACTION *Transaction,\r
IN CONST CHAR8 *DirectoryPath,\r
IN CONST CHAR8 *Node,\r
OUT UINT32 *LenPtr OPTIONAL,\r
\r
XENSTORE_STATUS\r
XenStoreWrite (\r
- IN XENSTORE_TRANSACTION Transaction,\r
+ IN CONST XENSTORE_TRANSACTION *Transaction,\r
IN CONST CHAR8 *DirectoryPath,\r
IN CONST CHAR8 *Node,\r
IN CONST CHAR8 *Str\r
Path = XenStoreJoin (DirectoryPath, Node);\r
\r
WriteRequest[0].Data = (VOID *) Path;\r
- WriteRequest[0].Len = AsciiStrSize (Path);\r
+ WriteRequest[0].Len = (UINT32)AsciiStrSize (Path);\r
WriteRequest[1].Data = (VOID *) Str;\r
- WriteRequest[1].Len = AsciiStrLen (Str);\r
+ WriteRequest[1].Len = (UINT32)AsciiStrLen (Str);\r
\r
Status = XenStoreTalkv (Transaction, XS_WRITE, WriteRequest, 2, NULL, NULL);\r
FreePool (Path);\r
\r
XENSTORE_STATUS\r
XenStoreRemove (\r
- IN XENSTORE_TRANSACTION Transaction,\r
+ IN CONST XENSTORE_TRANSACTION *Transaction,\r
IN CONST CHAR8 *DirectoryPath,\r
IN CONST CHAR8 *Node\r
)\r
Status = XenStoreSingle (XST_NIL, XS_TRANSACTION_START, "", NULL,\r
(VOID **) &IdStr);\r
if (Status == XENSTORE_STATUS_SUCCESS) {\r
- Transaction->Id = AsciiStrDecimalToUintn (IdStr);\r
+ Transaction->Id = (UINT32)AsciiStrDecimalToUintn (IdStr);\r
FreePool (IdStr);\r
}\r
\r
\r
XENSTORE_STATUS\r
XenStoreTransactionEnd (\r
- IN XENSTORE_TRANSACTION Transaction,\r
+ IN CONST XENSTORE_TRANSACTION *Transaction,\r
IN BOOLEAN Abort\r
)\r
{\r
CHAR8 AbortStr[2];\r
\r
- if (Abort) {\r
- AsciiStrCpy (AbortStr, "F");\r
- } else {\r
- AsciiStrCpy (AbortStr, "T");\r
- }\r
+ AbortStr[0] = Abort ? 'F' : 'T';\r
+ AbortStr[1] = '\0';\r
\r
return XenStoreSingle (Transaction, XS_TRANSACTION_END, AbortStr, NULL, NULL);\r
}\r
\r
XENSTORE_STATUS\r
+EFIAPI\r
XenStoreVSPrint (\r
- IN XENSTORE_TRANSACTION Transaction,\r
+ IN CONST XENSTORE_TRANSACTION *Transaction,\r
IN CONST CHAR8 *DirectoryPath,\r
IN CONST CHAR8 *Node,\r
IN CONST CHAR8 *FormatString,\r
CHAR8 *Buf;\r
XENSTORE_STATUS Status;\r
UINTN BufSize;\r
+ VA_LIST Marker2;\r
\r
- BufSize = SPrintLengthAsciiFormat (FormatString, Marker) + 1;\r
+ VA_COPY (Marker2, Marker);\r
+ BufSize = SPrintLengthAsciiFormat (FormatString, Marker2) + 1;\r
+ VA_END (Marker2);\r
Buf = AllocateZeroPool (BufSize);\r
AsciiVSPrint (Buf, BufSize, FormatString, Marker);\r
Status = XenStoreWrite (Transaction, DirectoryPath, Node, Buf);\r
XENSTORE_STATUS\r
EFIAPI\r
XenStoreSPrint (\r
- IN XENSTORE_TRANSACTION Transaction,\r
+ IN CONST XENSTORE_TRANSACTION *Transaction,\r
IN CONST CHAR8 *DirectoryPath,\r
IN CONST CHAR8 *Node,\r
IN CONST CHAR8 *FormatString,\r
Entry = GetNextNode (&xs.WatchEvents, Entry);\r
if (Message->u.Watch.Handle == Watch) {\r
RemoveEntryList (&Message->Link);\r
- FreePool (Message->u.Watch.Vector);\r
+ FreePool ((VOID*)Message->u.Watch.Vector);\r
FreePool (Message);\r
}\r
}\r
EFIAPI\r
XenBusXenStoreRead (\r
IN XENBUS_PROTOCOL *This,\r
- IN XENSTORE_TRANSACTION Transaction,\r
+ IN CONST XENSTORE_TRANSACTION *Transaction,\r
IN CONST CHAR8 *Node,\r
OUT VOID **Value\r
)\r
EFIAPI\r
XenBusXenStoreBackendRead (\r
IN XENBUS_PROTOCOL *This,\r
- IN XENSTORE_TRANSACTION Transaction,\r
+ IN CONST XENSTORE_TRANSACTION *Transaction,\r
IN CONST CHAR8 *Node,\r
OUT VOID **Value\r
)\r
EFIAPI\r
XenBusXenStoreRemove (\r
IN XENBUS_PROTOCOL *This,\r
- IN XENSTORE_TRANSACTION Transaction,\r
+ IN CONST XENSTORE_TRANSACTION *Transaction,\r
IN const char *Node\r
)\r
{\r
EFIAPI\r
XenBusXenStoreTransactionEnd (\r
IN XENBUS_PROTOCOL *This,\r
- IN XENSTORE_TRANSACTION Transaction,\r
+ IN CONST XENSTORE_TRANSACTION *Transaction,\r
IN BOOLEAN Abort\r
)\r
{\r
EFIAPI\r
XenBusXenStoreSPrint (\r
IN XENBUS_PROTOCOL *This,\r
- IN XENSTORE_TRANSACTION Transaction,\r
+ IN CONST XENSTORE_TRANSACTION *Transaction,\r
IN CONST CHAR8 *DirectoryPath,\r
IN CONST CHAR8 *Node,\r
IN CONST CHAR8 *FormatString,\r
projects / mirror_edk2.git / blobdiff