OvmfPkg/XenBusDxe: Fix ExitBootServices handler to avoid allocation

[edk2-devel] [PATCH 01/11] OvmfPkg/XenBusDxe: Fix missing \n in DEBUG messages

Posted by Anthony PERARD 6 years, 4 months ago

Fix missing \n in DEBUG messages in XenBusDxe and use DEBUG_*.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
 OvmfPkg/XenBusDxe/EventChannel.c | 3 ++-
 OvmfPkg/XenBusDxe/XenStore.c     | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/OvmfPkg/XenBusDxe/EventChannel.c b/OvmfPkg/XenBusDxe/EventChannel.c
index 6900071782..c6b3871781 100644
--- a/OvmfPkg/XenBusDxe/EventChannel.c
+++ b/OvmfPkg/XenBusDxe/EventChannel.c
@@ -44,7 +44,8 @@ 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\n",
+        ReturnCode));
     return ReturnCode;
   }
   *Port = Parameter.port;
diff --git a/OvmfPkg/XenBusDxe/XenStore.c b/OvmfPkg/XenBusDxe/XenStore.c
index 34890ae40b..7253d8ae37 100644
--- a/OvmfPkg/XenBusDxe/XenStore.c
+++ b/OvmfPkg/XenBusDxe/XenStore.c
@@ -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).\n",
               Status));
       return Status;
     }
@@ -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...\n"));
     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...\n"));
     Entry = GetFirstNode (&xs.WatchEvents);
     while (!IsNull (&xs.WatchEvents, Entry)) {
       XENSTORE_MESSAGE *Message = XENSTORE_MESSAGE_FROM_LINK (Entry);
-- 
Anthony PERARD


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#47209): https://edk2.groups.io/g/devel/message/47209
Mute This Topic: https://groups.io/mt/34128010/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [Xen-devel] [edk2-devel] [PATCH 01/11] OvmfPkg/XenBusDxe: Fix missing \n in DEBUG messages

Posted by Laszlo Ersek 6 years, 4 months ago

On 09/13/19 16:50, Anthony PERARD wrote:
> Fix missing \n in DEBUG messages in XenBusDxe and use DEBUG_*.
> 
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> ---
>  OvmfPkg/XenBusDxe/EventChannel.c | 3 ++-
>  OvmfPkg/XenBusDxe/XenStore.c     | 6 +++---
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/OvmfPkg/XenBusDxe/EventChannel.c b/OvmfPkg/XenBusDxe/EventChannel.c
> index 6900071782..c6b3871781 100644
> --- a/OvmfPkg/XenBusDxe/EventChannel.c
> +++ b/OvmfPkg/XenBusDxe/EventChannel.c
> @@ -44,7 +44,8 @@ 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\n",
> +        ReturnCode));
>      return ReturnCode;
>    }
>    *Port = Parameter.port;
> diff --git a/OvmfPkg/XenBusDxe/XenStore.c b/OvmfPkg/XenBusDxe/XenStore.c
> index 34890ae40b..7253d8ae37 100644
> --- a/OvmfPkg/XenBusDxe/XenStore.c
> +++ b/OvmfPkg/XenBusDxe/XenStore.c
> @@ -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).\n",
>                Status));
>        return Status;
>      }
> @@ -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...\n"));
>      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...\n"));
>      Entry = GetFirstNode (&xs.WatchEvents);
>      while (!IsNull (&xs.WatchEvents, Entry)) {
>        XENSTORE_MESSAGE *Message = XENSTORE_MESSAGE_FROM_LINK (Entry);
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel