diff options
| author | Anthony PERARD <anthony.perard@citrix.com> | 2014-10-31 21:25:23 +0000 |
|---|---|---|
| committer | jljusten <jljusten@Edk2> | 2014-10-31 21:25:23 +0000 |
| commit | e26a83cd29073c6528aee29226c4795ae1b1fd40 (patch) | |
| tree | f2f546d607c0847450559deba58119b43b00beb2 /OvmfPkg/XenPvBlkDxe | |
| parent | 8f148aee19d34f12372f924aae776e3781b66a59 (diff) | |
| download | edk2-e26a83cd29073c6528aee29226c4795ae1b1fd40.tar.gz edk2-e26a83cd29073c6528aee29226c4795ae1b1fd40.tar.bz2 edk2-e26a83cd29073c6528aee29226c4795ae1b1fd40.zip | |
OvmfPkg/Xen*: Pass struct XENSTORE_TRANSACTION argument as a pointer
As EDK II does not allow calls with a struct.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16294 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'OvmfPkg/XenPvBlkDxe')
| -rw-r--r-- | OvmfPkg/XenPvBlkDxe/BlockFront.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OvmfPkg/XenPvBlkDxe/BlockFront.c b/OvmfPkg/XenPvBlkDxe/BlockFront.c index 3c039e7add..8d43d833b0 100644 --- a/OvmfPkg/XenPvBlkDxe/BlockFront.c +++ b/OvmfPkg/XenPvBlkDxe/BlockFront.c @@ -166,7 +166,7 @@ XenPvBlockFrontInitialization ( OUT XEN_BLOCK_FRONT_DEVICE **DevPtr
)
{
- XENSTORE_TRANSACTION xbt;
+ XENSTORE_TRANSACTION Transaction;
CHAR8 *DeviceType;
blkif_sring_t *SharedRing;
XENSTORE_STATUS Status;
@@ -209,38 +209,38 @@ XenPvBlockFrontInitialization ( &Dev->RingRef);
Again:
- Status = XenBusIo->XsTransactionStart (XenBusIo, &xbt);
+ Status = XenBusIo->XsTransactionStart (XenBusIo, &Transaction);
if (Status != XENSTORE_STATUS_SUCCESS) {
DEBUG ((EFI_D_WARN, "XenPvBlk: Failed to start transaction, %d\n", Status));
goto Error;
}
- Status = XenBusIo->XsPrintf (XenBusIo, xbt, NodeName, "ring-ref", "%d",
+ Status = XenBusIo->XsPrintf (XenBusIo, &Transaction, NodeName, "ring-ref", "%d",
Dev->RingRef);
if (Status != XENSTORE_STATUS_SUCCESS) {
DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to write ring-ref.\n"));
goto AbortTransaction;
}
- Status = XenBusIo->XsPrintf (XenBusIo, xbt, NodeName,
+ Status = XenBusIo->XsPrintf (XenBusIo, &Transaction, NodeName,
"event-channel", "%d", Dev->EventChannel);
if (Status != XENSTORE_STATUS_SUCCESS) {
DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to write event-channel.\n"));
goto AbortTransaction;
}
- Status = XenBusIo->XsPrintf (XenBusIo, xbt, NodeName,
+ Status = XenBusIo->XsPrintf (XenBusIo, &Transaction, NodeName,
"protocol", "%a", XEN_IO_PROTO_ABI_NATIVE);
if (Status != XENSTORE_STATUS_SUCCESS) {
DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to write protocol.\n"));
goto AbortTransaction;
}
- Status = XenBusIo->SetState (XenBusIo, xbt, XenbusStateConnected);
+ Status = XenBusIo->SetState (XenBusIo, &Transaction, XenbusStateConnected);
if (Status != XENSTORE_STATUS_SUCCESS) {
DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to switch state.\n"));
goto AbortTransaction;
}
- Status = XenBusIo->XsTransactionEnd (XenBusIo, xbt, FALSE);
+ Status = XenBusIo->XsTransactionEnd (XenBusIo, &Transaction, FALSE);
if (Status == XENSTORE_STATUS_EAGAIN) {
goto Again;
}
@@ -319,7 +319,7 @@ Error2: XenBusIo->XsRemove (XenBusIo, XST_NIL, "protocol");
goto Error;
AbortTransaction:
- XenBusIo->XsTransactionEnd (XenBusIo, xbt, TRUE);
+ XenBusIo->XsTransactionEnd (XenBusIo, &Transaction, TRUE);
Error:
XenPvBlockFree (Dev);
return EFI_DEVICE_ERROR;
|