OvmfPkg: Apply uncrustify changes
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Apply uncrustify changes to .c/.h files in the OvmfPkg package Cc: Andrew Fish <afish@apple.com> Cc: Leif Lindholm <leif@nuviainc.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com> Reviewed-by: Andrew Fish <afish@apple.com>
This commit is contained in:
committed by
mergify[bot]
parent
d1050b9dff
commit
ac0a286f4d
@@ -26,16 +26,16 @@
|
||||
|
||||
#include <IndustryStandard/Xen/io/xenbus.h>
|
||||
|
||||
STATIC XENBUS_PRIVATE_DATA gXenBusPrivateData;
|
||||
STATIC XENBUS_PRIVATE_DATA gXenBusPrivateData;
|
||||
|
||||
STATIC XENBUS_DEVICE_PATH gXenBusDevicePathTemplate = {
|
||||
STATIC XENBUS_DEVICE_PATH gXenBusDevicePathTemplate = {
|
||||
{ // Vendor
|
||||
{ // Vendor.Header
|
||||
HARDWARE_DEVICE_PATH, // Vendor.Header.Type
|
||||
HW_VENDOR_DP, // Vendor.Header.SubType
|
||||
{
|
||||
(UINT8) (sizeof (XENBUS_DEVICE_PATH)), // Vendor.Header.Length[0]
|
||||
(UINT8) (sizeof (XENBUS_DEVICE_PATH) >> 8), // Vendor.Header.Length[1]
|
||||
(UINT8)(sizeof (XENBUS_DEVICE_PATH)), // Vendor.Header.Length[0]
|
||||
(UINT8)(sizeof (XENBUS_DEVICE_PATH) >> 8), // Vendor.Header.Length[1]
|
||||
}
|
||||
},
|
||||
XENBUS_PROTOCOL_GUID, // Vendor.Guid
|
||||
@@ -44,7 +44,6 @@ STATIC XENBUS_DEVICE_PATH gXenBusDevicePathTemplate = {
|
||||
0 // DeviceId
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
Search our internal record of configured devices (not the XenStore) to
|
||||
determine if the XenBus device indicated by Node is known to the system.
|
||||
@@ -57,13 +56,13 @@ STATIC XENBUS_DEVICE_PATH gXenBusDevicePathTemplate = {
|
||||
STATIC
|
||||
XENBUS_PRIVATE_DATA *
|
||||
XenBusDeviceInitialized (
|
||||
IN XENBUS_DEVICE *Dev,
|
||||
IN CONST CHAR8 *Node
|
||||
IN XENBUS_DEVICE *Dev,
|
||||
IN CONST CHAR8 *Node
|
||||
)
|
||||
{
|
||||
LIST_ENTRY *Entry;
|
||||
XENBUS_PRIVATE_DATA *Child;
|
||||
XENBUS_PRIVATE_DATA *Result;
|
||||
LIST_ENTRY *Entry;
|
||||
XENBUS_PRIVATE_DATA *Child;
|
||||
XENBUS_PRIVATE_DATA *Result;
|
||||
|
||||
if (IsListEmpty (&Dev->ChildList)) {
|
||||
return NULL;
|
||||
@@ -72,7 +71,8 @@ XenBusDeviceInitialized (
|
||||
Result = NULL;
|
||||
for (Entry = GetFirstNode (&Dev->ChildList);
|
||||
!IsNodeAtEnd (&Dev->ChildList, Entry);
|
||||
Entry = GetNextNode (&Dev->ChildList, Entry)) {
|
||||
Entry = GetNextNode (&Dev->ChildList, Entry))
|
||||
{
|
||||
Child = XENBUS_PRIVATE_DATA_FROM_LINK (Entry);
|
||||
if (!AsciiStrCmp (Child->XenBusIo.Node, Node)) {
|
||||
Result = Child;
|
||||
@@ -86,12 +86,12 @@ XenBusDeviceInitialized (
|
||||
STATIC
|
||||
XenbusState
|
||||
XenBusReadDriverState (
|
||||
IN CONST CHAR8 *Path
|
||||
IN CONST CHAR8 *Path
|
||||
)
|
||||
{
|
||||
XenbusState State;
|
||||
CHAR8 *Ptr = NULL;
|
||||
XENSTORE_STATUS Status;
|
||||
XenbusState State;
|
||||
CHAR8 *Ptr = NULL;
|
||||
XENSTORE_STATUS Status;
|
||||
|
||||
Status = XenStoreRead (XST_NIL, Path, "state", NULL, (VOID **)&Ptr);
|
||||
if (Status != XENSTORE_STATUS_SUCCESS) {
|
||||
@@ -113,24 +113,30 @@ XenBusReadDriverState (
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
XenBusAddDevice (
|
||||
XENBUS_DEVICE *Dev,
|
||||
CONST CHAR8 *Type,
|
||||
CONST CHAR8 *Id)
|
||||
XENBUS_DEVICE *Dev,
|
||||
CONST CHAR8 *Type,
|
||||
CONST CHAR8 *Id
|
||||
)
|
||||
{
|
||||
CHAR8 DevicePath[XENSTORE_ABS_PATH_MAX];
|
||||
XENSTORE_STATUS StatusXenStore;
|
||||
XENBUS_PRIVATE_DATA *Private;
|
||||
EFI_STATUS Status;
|
||||
XENBUS_DEVICE_PATH *TempXenBusPath;
|
||||
VOID *ChildXenIo;
|
||||
CHAR8 DevicePath[XENSTORE_ABS_PATH_MAX];
|
||||
XENSTORE_STATUS StatusXenStore;
|
||||
XENBUS_PRIVATE_DATA *Private;
|
||||
EFI_STATUS Status;
|
||||
XENBUS_DEVICE_PATH *TempXenBusPath;
|
||||
VOID *ChildXenIo;
|
||||
|
||||
AsciiSPrint (DevicePath, sizeof (DevicePath),
|
||||
"device/%a/%a", Type, Id);
|
||||
AsciiSPrint (
|
||||
DevicePath,
|
||||
sizeof (DevicePath),
|
||||
"device/%a/%a",
|
||||
Type,
|
||||
Id
|
||||
);
|
||||
|
||||
if (XenStorePathExists (XST_NIL, DevicePath, "")) {
|
||||
XENBUS_PRIVATE_DATA *Child;
|
||||
enum xenbus_state State;
|
||||
CHAR8 *BackendPath;
|
||||
XENBUS_PRIVATE_DATA *Child;
|
||||
enum xenbus_state State;
|
||||
CHAR8 *BackendPath;
|
||||
|
||||
Child = XenBusDeviceInitialized (Dev, DevicePath);
|
||||
if (Child != NULL) {
|
||||
@@ -148,57 +154,80 @@ XenBusAddDevice (
|
||||
* happen if a device is going away after
|
||||
* switching to Closed.
|
||||
*/
|
||||
DEBUG ((DEBUG_INFO, "XenBus: Device %a ignored. "
|
||||
"State %d\n", DevicePath, State));
|
||||
DEBUG ((
|
||||
DEBUG_INFO,
|
||||
"XenBus: Device %a ignored. "
|
||||
"State %d\n",
|
||||
DevicePath,
|
||||
State
|
||||
));
|
||||
Status = EFI_SUCCESS;
|
||||
goto out;
|
||||
}
|
||||
|
||||
StatusXenStore = XenStoreRead (XST_NIL, DevicePath, "backend",
|
||||
NULL, (VOID **) &BackendPath);
|
||||
StatusXenStore = XenStoreRead (
|
||||
XST_NIL,
|
||||
DevicePath,
|
||||
"backend",
|
||||
NULL,
|
||||
(VOID **)&BackendPath
|
||||
);
|
||||
if (StatusXenStore != XENSTORE_STATUS_SUCCESS) {
|
||||
DEBUG ((DEBUG_ERROR, "xenbus: %a no backend path.\n", DevicePath));
|
||||
Status = EFI_NOT_FOUND;
|
||||
goto out;
|
||||
}
|
||||
|
||||
Private = AllocateCopyPool (sizeof (*Private), &gXenBusPrivateData);
|
||||
Private->XenBusIo.Type = AsciiStrDup (Type);
|
||||
Private->XenBusIo.Node = AsciiStrDup (DevicePath);
|
||||
Private->XenBusIo.Backend = BackendPath;
|
||||
Private = AllocateCopyPool (sizeof (*Private), &gXenBusPrivateData);
|
||||
Private->XenBusIo.Type = AsciiStrDup (Type);
|
||||
Private->XenBusIo.Node = AsciiStrDup (DevicePath);
|
||||
Private->XenBusIo.Backend = BackendPath;
|
||||
Private->XenBusIo.DeviceId = (UINT16)AsciiStrDecimalToUintn (Id);
|
||||
Private->Dev = Dev;
|
||||
Private->Dev = Dev;
|
||||
|
||||
TempXenBusPath = AllocateCopyPool (sizeof (XENBUS_DEVICE_PATH),
|
||||
&gXenBusDevicePathTemplate);
|
||||
TempXenBusPath = AllocateCopyPool (
|
||||
sizeof (XENBUS_DEVICE_PATH),
|
||||
&gXenBusDevicePathTemplate
|
||||
);
|
||||
if (!AsciiStrCmp (Private->XenBusIo.Type, "vbd")) {
|
||||
TempXenBusPath->Type = XENBUS_DEVICE_PATH_TYPE_VBD;
|
||||
}
|
||||
|
||||
TempXenBusPath->DeviceId = Private->XenBusIo.DeviceId;
|
||||
Private->DevicePath = (XENBUS_DEVICE_PATH *)AppendDevicePathNode (
|
||||
Dev->DevicePath,
|
||||
&TempXenBusPath->Vendor.Header);
|
||||
Private->DevicePath = (XENBUS_DEVICE_PATH *)AppendDevicePathNode (
|
||||
Dev->DevicePath,
|
||||
&TempXenBusPath->Vendor.Header
|
||||
);
|
||||
FreePool (TempXenBusPath);
|
||||
|
||||
InsertTailList (&Dev->ChildList, &Private->Link);
|
||||
|
||||
Status = gBS->InstallMultipleProtocolInterfaces (
|
||||
&Private->Handle,
|
||||
&gEfiDevicePathProtocolGuid, Private->DevicePath,
|
||||
&gXenBusProtocolGuid, &Private->XenBusIo,
|
||||
NULL);
|
||||
&Private->Handle,
|
||||
&gEfiDevicePathProtocolGuid,
|
||||
Private->DevicePath,
|
||||
&gXenBusProtocolGuid,
|
||||
&Private->XenBusIo,
|
||||
NULL
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
goto ErrorInstallProtocol;
|
||||
}
|
||||
|
||||
Status = gBS->OpenProtocol (Dev->ControllerHandle,
|
||||
&gXenIoProtocolGuid,
|
||||
&ChildXenIo, Dev->This->DriverBindingHandle,
|
||||
Private->Handle,
|
||||
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER);
|
||||
Status = gBS->OpenProtocol (
|
||||
Dev->ControllerHandle,
|
||||
&gXenIoProtocolGuid,
|
||||
&ChildXenIo,
|
||||
Dev->This->DriverBindingHandle,
|
||||
Private->Handle,
|
||||
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
DEBUG ((DEBUG_ERROR, "open by child controller fail (%r)\n",
|
||||
Status));
|
||||
DEBUG ((
|
||||
DEBUG_ERROR,
|
||||
"open by child controller fail (%r)\n",
|
||||
Status
|
||||
));
|
||||
goto ErrorOpenProtocolByChild;
|
||||
}
|
||||
} else {
|
||||
@@ -210,16 +239,19 @@ XenBusAddDevice (
|
||||
|
||||
ErrorOpenProtocolByChild:
|
||||
gBS->UninstallMultipleProtocolInterfaces (
|
||||
Private->Handle,
|
||||
&gEfiDevicePathProtocolGuid, Private->DevicePath,
|
||||
&gXenBusProtocolGuid, &Private->XenBusIo,
|
||||
NULL);
|
||||
Private->Handle,
|
||||
&gEfiDevicePathProtocolGuid,
|
||||
Private->DevicePath,
|
||||
&gXenBusProtocolGuid,
|
||||
&Private->XenBusIo,
|
||||
NULL
|
||||
);
|
||||
ErrorInstallProtocol:
|
||||
RemoveEntryList (&Private->Link);
|
||||
FreePool (Private->DevicePath);
|
||||
FreePool ((VOID *) Private->XenBusIo.Backend);
|
||||
FreePool ((VOID *) Private->XenBusIo.Node);
|
||||
FreePool ((VOID *) Private->XenBusIo.Type);
|
||||
FreePool ((VOID *)Private->XenBusIo.Backend);
|
||||
FreePool ((VOID *)Private->XenBusIo.Node);
|
||||
FreePool ((VOID *)Private->XenBusIo.Type);
|
||||
FreePool (Private);
|
||||
out:
|
||||
return Status;
|
||||
@@ -239,29 +271,33 @@ out:
|
||||
STATIC
|
||||
VOID
|
||||
XenBusEnumerateDeviceType (
|
||||
XENBUS_DEVICE *Dev,
|
||||
CONST CHAR8 *Type
|
||||
XENBUS_DEVICE *Dev,
|
||||
CONST CHAR8 *Type
|
||||
)
|
||||
{
|
||||
CONST CHAR8 **Directory;
|
||||
UINTN Index;
|
||||
UINT32 Count;
|
||||
XENSTORE_STATUS Status;
|
||||
CONST CHAR8 **Directory;
|
||||
UINTN Index;
|
||||
UINT32 Count;
|
||||
XENSTORE_STATUS Status;
|
||||
|
||||
Status = XenStoreListDirectory (XST_NIL,
|
||||
"device", Type,
|
||||
&Count, &Directory);
|
||||
Status = XenStoreListDirectory (
|
||||
XST_NIL,
|
||||
"device",
|
||||
Type,
|
||||
&Count,
|
||||
&Directory
|
||||
);
|
||||
if (Status != XENSTORE_STATUS_SUCCESS) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (Index = 0; Index < Count; Index++) {
|
||||
XenBusAddDevice (Dev, Type, Directory[Index]);
|
||||
}
|
||||
|
||||
FreePool ((VOID*)Directory);
|
||||
FreePool ((VOID *)Directory);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
Enumerate the devices on a XenBus bus and install a XenBus Protocol instance.
|
||||
|
||||
@@ -275,17 +311,21 @@ XenBusEnumerateDeviceType (
|
||||
*/
|
||||
XENSTORE_STATUS
|
||||
XenBusEnumerateBus (
|
||||
XENBUS_DEVICE *Dev
|
||||
XENBUS_DEVICE *Dev
|
||||
)
|
||||
{
|
||||
CONST CHAR8 **Types;
|
||||
UINTN Index;
|
||||
UINT32 Count;
|
||||
XENSTORE_STATUS Status;
|
||||
CONST CHAR8 **Types;
|
||||
UINTN Index;
|
||||
UINT32 Count;
|
||||
XENSTORE_STATUS Status;
|
||||
|
||||
Status = XenStoreListDirectory (XST_NIL,
|
||||
"device", "",
|
||||
&Count, &Types);
|
||||
Status = XenStoreListDirectory (
|
||||
XST_NIL,
|
||||
"device",
|
||||
"",
|
||||
&Count,
|
||||
&Types
|
||||
);
|
||||
if (Status != XENSTORE_STATUS_SUCCESS) {
|
||||
return Status;
|
||||
}
|
||||
@@ -294,7 +334,7 @@ XenBusEnumerateBus (
|
||||
XenBusEnumerateDeviceType (Dev, Types[Index]);
|
||||
}
|
||||
|
||||
FreePool ((VOID*)Types);
|
||||
FreePool ((VOID *)Types);
|
||||
|
||||
return XENSTORE_STATUS_SUCCESS;
|
||||
}
|
||||
@@ -303,14 +343,14 @@ STATIC
|
||||
XENSTORE_STATUS
|
||||
EFIAPI
|
||||
XenBusSetState (
|
||||
IN XENBUS_PROTOCOL *This,
|
||||
IN CONST XENSTORE_TRANSACTION *Transaction,
|
||||
IN enum xenbus_state NewState
|
||||
IN XENBUS_PROTOCOL *This,
|
||||
IN CONST XENSTORE_TRANSACTION *Transaction,
|
||||
IN enum xenbus_state NewState
|
||||
)
|
||||
{
|
||||
enum xenbus_state CurrentState;
|
||||
XENSTORE_STATUS Status;
|
||||
CHAR8 *Temp;
|
||||
enum xenbus_state CurrentState;
|
||||
XENSTORE_STATUS Status;
|
||||
CHAR8 *Temp;
|
||||
|
||||
DEBUG ((DEBUG_INFO, "XenBus: Set state to %d\n", NewState));
|
||||
|
||||
@@ -318,6 +358,7 @@ XenBusSetState (
|
||||
if (Status != XENSTORE_STATUS_SUCCESS) {
|
||||
goto Out;
|
||||
}
|
||||
|
||||
CurrentState = AsciiStrDecimalToUintn (Temp);
|
||||
FreePool (Temp);
|
||||
if (CurrentState == NewState) {
|
||||
@@ -327,17 +368,19 @@ XenBusSetState (
|
||||
do {
|
||||
Status = XenStoreSPrint (Transaction, This->Node, "state", "%d", NewState);
|
||||
} while (Status == XENSTORE_STATUS_EAGAIN);
|
||||
|
||||
if (Status != XENSTORE_STATUS_SUCCESS) {
|
||||
DEBUG ((DEBUG_ERROR, "XenBus: failed to write new state\n"));
|
||||
goto Out;
|
||||
}
|
||||
|
||||
DEBUG ((DEBUG_INFO, "XenBus: Set state to %d, done\n", NewState));
|
||||
|
||||
Out:
|
||||
return Status;
|
||||
}
|
||||
|
||||
STATIC XENBUS_PRIVATE_DATA gXenBusPrivateData = {
|
||||
STATIC XENBUS_PRIVATE_DATA gXenBusPrivateData = {
|
||||
XENBUS_PRIVATE_DATA_SIGNATURE, // Signature
|
||||
{ NULL, NULL }, // Link
|
||||
NULL, // Handle
|
||||
|
Reference in New Issue
Block a user