sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OvmfPkg: replace old EFI_D_ debug levels with new DEBUG_ ones

Browse Source 
Generated mechanically with:
find OvmfPkg -type f -exec sed -i -e 's/EFI_D_/DEBUG_/g' {} \;

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Cc: Philippe Mathieu-Daude <philmd@redhat.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20200429215327.606467-1-rebecca@bsdio.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Rebecca Cran
2020-04-29 15:53:27 -06:00
committed by mergify[bot]
parent 2a7a1223d0
commit 70d5086c32
64 changed files with 355 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OvmfPkg/XenBusDxe/EventChannel.c
View File

@@ -44,7 +44,7 @@ XenBusEventChannelAllocate (
EVTCHNOP_alloc_unbound,
&Parameter);
if (ReturnCode != 0) {
DEBUG ((EFI_D_ERROR, "ERROR: alloc_unbound failed with rc=%d", ReturnCode));
DEBUG ((DEBUG_ERROR, "ERROR: alloc_unbound failed with rc=%d", ReturnCode));
return ReturnCode;
}
*Port = Parameter.port;

8
OvmfPkg/XenBusDxe/GrantTable.c
View File

@@ -107,7 +107,7 @@ XenGrantTableEndAccess (
OldFlags = GrantTable[Ref].flags;
do {
if ((Flags = OldFlags) & (GTF_reading | GTF_writing)) {
DEBUG ((EFI_D_WARN, "WARNING: g.e. still in use! (%x)\n", Flags));
DEBUG ((DEBUG_WARN, "WARNING: g.e. still in use! (%x)\n", Flags));
return EFI_NOT_READY;
}
OldFlags = InterlockedCompareExchange16 (&GrantTable[Ref].flags, Flags, 0);
@@ -142,7 +142,7 @@ XenGrantTableInit (
Parameters.gpfn = (xen_pfn_t) ((UINTN) GrantTable >> EFI_PAGE_SHIFT) + Index;
ReturnCode = XenHypercallMemoryOp (XENMEM_add_to_physmap, &Parameters);
if (ReturnCode != 0) {
DEBUG ((EFI_D_ERROR,
DEBUG ((DEBUG_ERROR,
"Xen GrantTable, add_to_physmap hypercall error: %Ld\n",
(INT64)ReturnCode));
}
@@ -164,11 +164,11 @@ XenGrantTableDeinit (
for (Index = NR_GRANT_FRAMES - 1; Index >= 0; Index--) {
Parameters.domid = DOMID_SELF;
Parameters.gpfn = (xen_pfn_t) ((UINTN) GrantTable >> EFI_PAGE_SHIFT) + Index;
DEBUG ((EFI_D_INFO, "Xen GrantTable, removing %Lx\n",
DEBUG ((DEBUG_INFO, "Xen GrantTable, removing %Lx\n",
(UINT64)Parameters.gpfn));
ReturnCode = XenHypercallMemoryOp (XENMEM_remove_from_physmap, &Parameters);
if (ReturnCode != 0) {
DEBUG ((EFI_D_ERROR,
DEBUG ((DEBUG_ERROR,
"Xen GrantTable, remove_from_physmap hypercall error: %Ld\n",
(INT64)ReturnCode));
}

14
OvmfPkg/XenBusDxe/XenBus.c
View File

@@ -148,7 +148,7 @@ XenBusAddDevice (
* happen if a device is going away after
* switching to Closed.
*/
DEBUG ((EFI_D_INFO, "XenBus: Device %a ignored. "
DEBUG ((DEBUG_INFO, "XenBus: Device %a ignored. "
"State %d\n", DevicePath, State));
Status = EFI_SUCCESS;
goto out;
@@ -157,7 +157,7 @@ XenBusAddDevice (
StatusXenStore = XenStoreRead (XST_NIL, DevicePath, "backend",
NULL, (VOID **) &BackendPath);
if (StatusXenStore != XENSTORE_STATUS_SUCCESS) {
DEBUG ((EFI_D_ERROR, "xenbus: %a no backend path.\n", DevicePath));
DEBUG ((DEBUG_ERROR, "xenbus: %a no backend path.\n", DevicePath));
Status = EFI_NOT_FOUND;
goto out;
}
@@ -197,12 +197,12 @@ XenBusAddDevice (
Private->Handle,
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "open by child controller fail (%r)\n",
DEBUG ((DEBUG_ERROR, "open by child controller fail (%r)\n",
Status));
goto ErrorOpenProtocolByChild;
}
} else {
DEBUG ((EFI_D_ERROR, "XenBus: does not exist: %a\n", DevicePath));
DEBUG ((DEBUG_ERROR, "XenBus: does not exist: %a\n", DevicePath));
Status = EFI_NOT_FOUND;
}
@@ -312,7 +312,7 @@ XenBusSetState (
XENSTORE_STATUS Status;
CHAR8 *Temp;
DEBUG ((EFI_D_INFO, "XenBus: Set state to %d\n", NewState));
DEBUG ((DEBUG_INFO, "XenBus: Set state to %d\n", NewState));
Status = XenStoreRead (Transaction, This->Node, "state", NULL, (VOID **)&Temp);
if (Status != XENSTORE_STATUS_SUCCESS) {
@@ -328,10 +328,10 @@ XenBusSetState (
Status = XenStoreSPrint (Transaction, This->Node, "state", "%d", NewState);
} while (Status == XENSTORE_STATUS_EAGAIN);
if (Status != XENSTORE_STATUS_SUCCESS) {
DEBUG ((EFI_D_ERROR, "XenBus: failed to write new state\n"));
DEBUG ((DEBUG_ERROR, "XenBus: failed to write new state\n"));
goto Out;
}
DEBUG ((EFI_D_INFO, "XenBus: Set state to %d, done\n", NewState));
DEBUG ((DEBUG_INFO, "XenBus: Set state to %d, done\n", NewState));
Out:
return Status;

4
OvmfPkg/XenBusDxe/XenBusDxe.c
View File

@@ -362,7 +362,7 @@ XenBusDxeDriverBindingStart (
Status = XenGetSharedInfoPage (Dev);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "XenBus: Unable to get the shared info page.\n"));
DEBUG ((DEBUG_ERROR, "XenBus: Unable to get the shared info page.\n"));
Status = EFI_UNSUPPORTED;
goto ErrorAllocated;
}
@@ -442,7 +442,7 @@ XenBusDxeDriverBindingStop (
ControllerHandle,
EFI_OPEN_PROTOCOL_GET_PROTOCOL);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "XenBusDxe: get children protocol failed: %r\n", Status));
DEBUG ((DEBUG_ERROR, "XenBusDxe: get children protocol failed: %r\n", Status));
continue;
}
ChildData = XENBUS_PRIVATE_DATA_FROM_THIS (XenBusIo);

28
OvmfPkg/XenBusDxe/XenStore.c
View File

@@ -467,7 +467,7 @@ XenStoreWriteStore (
Status = XenStoreWaitForEvent (xs.EventChannelEvent,
EFI_TIMER_PERIOD_SECONDS (1));
if (Status == EFI_TIMEOUT) {
DEBUG ((EFI_D_WARN, "XenStore Write, waiting for a ring event.\n"));
DEBUG ((DEBUG_WARN, "XenStore Write, waiting for a ring event.\n"));
}
continue;
}
@@ -546,7 +546,7 @@ XenStoreReadStore (
Status = XenStoreWaitForEvent (xs.EventChannelEvent,
EFI_TIMER_PERIOD_SECONDS (1));
if (Status == EFI_TIMEOUT) {
DEBUG ((EFI_D_WARN, "XenStore Read, waiting for a ring event.\n"));
DEBUG ((DEBUG_WARN, "XenStore Read, waiting for a ring event.\n"));
}
continue;
}
@@ -617,7 +617,7 @@ XenStoreProcessMessage (
Status = XenStoreReadStore (&Message->Header, sizeof (Message->Header));
if (Status != XENSTORE_STATUS_SUCCESS) {
FreePool (Message);
DEBUG ((EFI_D_ERROR, "XenStore: Error read store (%d)\n", Status));
DEBUG ((DEBUG_ERROR, "XenStore: Error read store (%d)\n", Status));
return Status;
}
@@ -626,7 +626,7 @@ XenStoreProcessMessage (
if (Status != XENSTORE_STATUS_SUCCESS) {
FreePool (Body);
FreePool (Message);
DEBUG ((EFI_D_ERROR, "XenStore: Error read store (%d)\n", Status));
DEBUG ((DEBUG_ERROR, "XenStore: Error read store (%d)\n", Status));
return Status;
}
Body[Message->Header.len] = '\0';
@@ -638,14 +638,14 @@ XenStoreProcessMessage (
EfiAcquireLock (&xs.RegisteredWatchesLock);
Message->u.Watch.Handle =
XenStoreFindWatch (Message->u.Watch.Vector[XS_WATCH_TOKEN]);
DEBUG ((EFI_D_INFO, "XenStore: Watch event %a\n",
DEBUG ((DEBUG_INFO, "XenStore: Watch event %a\n",
Message->u.Watch.Vector[XS_WATCH_TOKEN]));
if (Message->u.Watch.Handle != NULL) {
EfiAcquireLock (&xs.WatchEventsLock);
InsertHeadList (&xs.WatchEvents, &Message->Link);
EfiReleaseLock (&xs.WatchEventsLock);
} else {
DEBUG ((EFI_D_WARN, "XenStore: Watch handle %a not found\n",
DEBUG ((DEBUG_WARN, "XenStore: Watch handle %a not found\n",
Message->u.Watch.Vector[XS_WATCH_TOKEN]));
FreePool((VOID*)Message->u.Watch.Vector);
FreePool(Message);
@@ -711,7 +711,7 @@ XenStoreGetError (
return gXenStoreErrors[Index].Status;
}
}
DEBUG ((EFI_D_WARN, "XenStore gave unknown error %a\n", ErrorStr));
DEBUG ((DEBUG_WARN, "XenStore gave unknown error %a\n", ErrorStr));
return XENSTORE_STATUS_EINVAL;
}
@@ -738,7 +738,7 @@ XenStoreReadReply (
XENSTORE_STATUS Status;
Status = XenStoreProcessMessage ();
if (Status != XENSTORE_STATUS_SUCCESS && Status != XENSTORE_STATUS_EAGAIN) {
DEBUG ((EFI_D_ERROR, "XenStore, error while reading the ring (%d).",
DEBUG ((DEBUG_ERROR, "XenStore, error while reading the ring (%d).",
Status));
return Status;
}
@@ -803,14 +803,14 @@ XenStoreTalkv (
Status = XenStoreWriteStore (&Message, sizeof (Message));
if (Status != XENSTORE_STATUS_SUCCESS) {
DEBUG ((EFI_D_ERROR, "XenStoreTalkv failed %d\n", Status));
DEBUG ((DEBUG_ERROR, "XenStoreTalkv failed %d\n", Status));
goto Error;
}
for (Index = 0; Index < NumRequests; Index++) {
Status = XenStoreWriteStore (WriteRequest[Index].Data, WriteRequest[Index].Len);
if (Status != XENSTORE_STATUS_SUCCESS) {
DEBUG ((EFI_D_ERROR, "XenStoreTalkv failed %d\n", Status));
DEBUG ((DEBUG_ERROR, "XenStoreTalkv failed %d\n", Status));
goto Error;
}
}
@@ -1006,7 +1006,7 @@ XenStoreInitComms (
while (XenStore->rsp_prod != XenStore->rsp_cons) {
Status = gBS->CheckEvent (TimerEvent);
if (!EFI_ERROR (Status)) {
DEBUG ((EFI_D_WARN, "XENSTORE response ring is not quiescent "
DEBUG ((DEBUG_WARN, "XENSTORE response ring is not quiescent "
"(%08x:%08x): fixing up\n",
XenStore->rsp_cons, XenStore->rsp_prod));
XenStore->rsp_cons = XenStore->rsp_prod;
@@ -1046,7 +1046,7 @@ XenStoreInit (
xs.EventChannel = (evtchn_port_t)XenHypercallHvmGetParam (HVM_PARAM_STORE_EVTCHN);
XenStoreGpfn = (UINTN)XenHypercallHvmGetParam (HVM_PARAM_STORE_PFN);
xs.XenStore = (VOID *) (XenStoreGpfn << EFI_PAGE_SHIFT);
DEBUG ((EFI_D_INFO, "XenBusInit: XenBus rings @%p, event channel %x\n",
DEBUG ((DEBUG_INFO, "XenBusInit: XenBus rings @%p, event channel %x\n",
xs.XenStore, xs.EventChannel));
InitializeListHead (&xs.ReplyList);
@@ -1076,7 +1076,7 @@ XenStoreDeinit (
if (!IsListEmpty (&xs.RegisteredWatches)) {
XENSTORE_WATCH *Watch;
LIST_ENTRY *Entry;
DEBUG ((EFI_D_WARN, "XenStore: RegisteredWatches is not empty, cleaning up..."));
DEBUG ((DEBUG_WARN, "XenStore: RegisteredWatches is not empty, cleaning up..."));
Entry = GetFirstNode (&xs.RegisteredWatches);
while (!IsNull (&xs.RegisteredWatches, Entry)) {
Watch = XENSTORE_WATCH_FROM_LINK (Entry);
@@ -1092,7 +1092,7 @@ XenStoreDeinit (
//
if (!IsListEmpty (&xs.WatchEvents)) {
LIST_ENTRY *Entry;
DEBUG ((EFI_D_WARN, "XenStore: WatchEvents is not empty, cleaning up..."));
DEBUG ((DEBUG_WARN, "XenStore: WatchEvents is not empty, cleaning up..."));
Entry = GetFirstNode (&xs.WatchEvents);
while (!IsNull (&xs.WatchEvents, Entry)) {
XENSTORE_MESSAGE *Message = XENSTORE_MESSAGE_FROM_LINK (Entry);