[PATCH 2/2] efi: Stop using StdErr

[Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>]

Xen's use of StdErr is inconsistent. Some boot errors are reported using
PrintErr() which uses StdErr and some are reported using blexit() which
uses StdOut.

On my test system using OVMF, StdErr is not displayed on the emulated
screen. Looking at other EFI applications, StdErr is just used for debug
messages if at all.

Therefore, switch all boot output to use StdOut.

Signed-off-by: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
---
 xen/common/efi/boot.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
index 50ff1d1bd225..6ba486943466 100644
--- a/xen/common/efi/boot.c
+++ b/xen/common/efi/boot.c
@@ -153,7 +153,6 @@ static UINT32 __initdata efi_bs_revision;
 static EFI_HANDLE __initdata efi_ih;
 
 static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdOut;
-static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdErr;
 
 static UINT32 __initdata mdesc_ver;
 static bool __initdata map_bs;
@@ -168,11 +167,7 @@ static void __init PrintStr(const CHAR16 *s)
 {
     StdOut->OutputString(StdOut, (CHAR16 *)s );
 }
-
-static void __init PrintErr(const CHAR16 *s)
-{
-    StdErr->OutputString(StdErr, (CHAR16 *)s );
-}
+#define PrintErr PrintStr
 
 static CHAR16 *__init FormatDec(UINT64 Val, CHAR16 *Buffer)
 {
@@ -287,7 +282,6 @@ static bool __init match_guid(const EFI_GUID *guid1, const 
EFI_GUID *guid2)
 /* generic routine for printing error messages */
 static void __init noreturn PrintErrMesg(const CHAR16 *mesg, EFI_STATUS 
ErrCode)
 {
-    StdOut = StdErr;
     PrintErr(mesg);
     PrintErr(L": ");
 
@@ -914,7 +908,6 @@ static void __init efi_init(EFI_HANDLE ImageHandle, 
EFI_SYSTEM_TABLE *SystemTabl
     efi_fw_revision = SystemTable->FirmwareRevision;
 
     StdOut = SystemTable->ConOut;
-    StdErr = SystemTable->StdErr ?: StdOut;
 }
 
 static void __init efi_console_set_mode(void)
-- 
2.50.1