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

[mirror_edk2.git] / OvmfPkg / XenPvBlkDxe / BlockFront.c

diff --git a/OvmfPkg/XenPvBlkDxe/BlockFront.c b/OvmfPkg/XenPvBlkDxe/BlockFront.c
index 3c039e7add2d1d6f163f69754c9b88b52b217c44..8d43d833b0b5ff23dfe5db94772a64703cc595f1 100644 (file)
--- a/OvmfPkg/XenPvBlkDxe/BlockFront.c
+++ b/OvmfPkg/XenPvBlkDxe/BlockFront.c
@@ -166,7 +166,7 @@ XenPvBlockFrontInitialization (
   OUT XEN_BLOCK_FRONT_DEVICE  **DevPtr\r
   )\r
 {\r
-  XENSTORE_TRANSACTION xbt;\r
+  XENSTORE_TRANSACTION Transaction;\r
   CHAR8 *DeviceType;\r
   blkif_sring_t *SharedRing;\r
   XENSTORE_STATUS Status;\r
@@ -209,38 +209,38 @@ XenPvBlockFrontInitialization (
                          &Dev->RingRef);\r
 \r
 Again:\r
-  Status = XenBusIo->XsTransactionStart (XenBusIo, &xbt);\r
+  Status = XenBusIo->XsTransactionStart (XenBusIo, &Transaction);\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     DEBUG ((EFI_D_WARN, "XenPvBlk: Failed to start transaction, %d\n", Status));\r
     goto Error;\r
   }\r
 \r
-  Status = XenBusIo->XsPrintf (XenBusIo, xbt, NodeName, "ring-ref", "%d",\r
+  Status = XenBusIo->XsPrintf (XenBusIo, &Transaction, NodeName, "ring-ref", "%d",\r
                                Dev->RingRef);\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to write ring-ref.\n"));\r
     goto AbortTransaction;\r
   }\r
-  Status = XenBusIo->XsPrintf (XenBusIo, xbt, NodeName,\r
+  Status = XenBusIo->XsPrintf (XenBusIo, &Transaction, NodeName,\r
                                "event-channel", "%d", Dev->EventChannel);\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to write event-channel.\n"));\r
     goto AbortTransaction;\r
   }\r
-  Status = XenBusIo->XsPrintf (XenBusIo, xbt, NodeName,\r
+  Status = XenBusIo->XsPrintf (XenBusIo, &Transaction, NodeName,\r
                                "protocol", "%a", XEN_IO_PROTO_ABI_NATIVE);\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to write protocol.\n"));\r
     goto AbortTransaction;\r
   }\r
 \r
-  Status = XenBusIo->SetState (XenBusIo, xbt, XenbusStateConnected);\r
+  Status = XenBusIo->SetState (XenBusIo, &Transaction, XenbusStateConnected);\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to switch state.\n"));\r
     goto AbortTransaction;\r
   }\r
 \r
-  Status = XenBusIo->XsTransactionEnd (XenBusIo, xbt, FALSE);\r
+  Status = XenBusIo->XsTransactionEnd (XenBusIo, &Transaction, FALSE);\r
   if (Status == XENSTORE_STATUS_EAGAIN) {\r
     goto Again;\r
   }\r
@@ -319,7 +319,7 @@ Error2:
   XenBusIo->XsRemove (XenBusIo, XST_NIL, "protocol");\r
   goto Error;\r
 AbortTransaction:\r
-  XenBusIo->XsTransactionEnd (XenBusIo, xbt, TRUE);\r
+  XenBusIo->XsTransactionEnd (XenBusIo, &Transaction, TRUE);\r
 Error:\r
   XenPvBlockFree (Dev);\r
   return EFI_DEVICE_ERROR;\r