OvmfPkg/Xen*: Pass struct XENSTORE_TRANSACTION argument as a pointer

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

diff --git a/OvmfPkg/XenBusDxe/XenStore.c b/OvmfPkg/XenBusDxe/XenStore.c
index aed6b141bdcd88c5ab1389d5b684f9a0031e7761..f176b95a4ded24d095ed6929a9d26f8b12d648a8 100644 (file)
--- a/OvmfPkg/XenBusDxe/XenStore.c
+++ b/OvmfPkg/XenBusDxe/XenStore.c
@@ -790,7 +790,7 @@ XenStoreReadReply (
 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
@@ -803,7 +803,11 @@ XenStoreTalkv (
   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
@@ -869,7 +873,7 @@ Error:
 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
@@ -1157,7 +1161,7 @@ XenStoreDeinit (
 \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
@@ -1184,7 +1188,7 @@ XenStoreListDirectory (
 \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
@@ -1204,7 +1208,7 @@ XenStorePathExists (
 \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
@@ -1228,7 +1232,7 @@ XenStoreRead (
 \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
@@ -1253,7 +1257,7 @@ XenStoreWrite (
 \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
@@ -1288,7 +1292,7 @@ XenStoreTransactionStart (
 \r
 XENSTORE_STATUS\r
 XenStoreTransactionEnd (\r
-  IN XENSTORE_TRANSACTION   Transaction,\r
+  IN CONST XENSTORE_TRANSACTION *Transaction,\r
   IN BOOLEAN                Abort\r
   )\r
 {\r
@@ -1305,7 +1309,7 @@ XenStoreTransactionEnd (
 \r
 XENSTORE_STATUS\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
@@ -1328,7 +1332,7 @@ XenStoreVSPrint (
 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
@@ -1444,7 +1448,7 @@ XENSTORE_STATUS
 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
@@ -1456,7 +1460,7 @@ XENSTORE_STATUS
 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
@@ -1468,7 +1472,7 @@ XENSTORE_STATUS
 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
@@ -1489,7 +1493,7 @@ XENSTORE_STATUS
 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
@@ -1500,7 +1504,7 @@ XENSTORE_STATUS
 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