From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: michael.d.kinney@intel.com) Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 21 Aug 2019 19:36:13 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Aug 2019 19:36:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,415,1559545200"; d="scan'208";a="181225535" Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga003.jf.intel.com with ESMTP; 21 Aug 2019 19:36:12 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jordan Justen , Ray Ni , Andrew Fish , Tim Lewis Subject: [Patch][edk2-stable201908 2/2] EmulatorPkg/Win/Host: Fix SecPrint() log line endings Date: Wed, 21 Aug 2019 19:36:10 -0700 Message-Id: <20190822023610.2068-3-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190822023610.2068-1-michael.d.kinney@intel.com> References: <20190822023610.2068-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Update use of SecPrint() to consistently use \n\r for line endings to fix formatting issues in the debug log. Cc: Jordan Justen Cc: Ray Ni Cc: Andrew Fish Cc: Tim Lewis Signed-off-by: Michael D Kinney --- EmulatorPkg/Win/Host/WinHost.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/EmulatorPkg/Win/Host/WinHost.c b/EmulatorPkg/Win/Host/WinHost.c index 9c6acac279..9aba3c8959 100644 --- a/EmulatorPkg/Win/Host/WinHost.c +++ b/EmulatorPkg/Win/Host/WinHost.c @@ -408,7 +408,7 @@ Returns: MemorySizeStr = (CHAR16 *) PcdGetPtr (PcdEmuMemorySize); FirmwareVolumesStr = (CHAR16 *) PcdGetPtr (PcdEmuFirmwareVolume); - SecPrint ("\nEDK II WIN Host Emulation Environment from http://www.tianocore.org/edk2/\n"); + SecPrint ("\n\rEDK II WIN Host Emulation Environment from http://www.tianocore.org/edk2/\n\r"); // // Determine the first thread available to this process. @@ -450,7 +450,7 @@ Returns: gSystemMemoryCount = CountSeparatorsInString (MemorySizeStr, '!') + 1; gSystemMemory = calloc (gSystemMemoryCount, sizeof (NT_SYSTEM_MEMORY)); if (gSystemMemory == NULL) { - SecPrint ("ERROR : Can not allocate memory for %S. Exiting.\n", MemorySizeStr); + SecPrint ("ERROR : Can not allocate memory for %S. Exiting.\n\r", MemorySizeStr); exit (1); } @@ -460,13 +460,13 @@ Returns: gFdInfoCount = CountSeparatorsInString (FirmwareVolumesStr, '!') + 1; gFdInfo = calloc (gFdInfoCount, sizeof (NT_FD_INFO)); if (gFdInfo == NULL) { - SecPrint ("ERROR : Can not allocate memory for %S. Exiting.\n", FirmwareVolumesStr); + SecPrint ("ERROR : Can not allocate memory for %S. Exiting.\n\r", FirmwareVolumesStr); exit (1); } // // Setup Boot Mode. // - SecPrint (" BootMode 0x%02x\n", PcdGet32 (PcdEmuBootMode)); + SecPrint (" BootMode 0x%02x\n\r", PcdGet32 (PcdEmuBootMode)); // // Allocate 128K memory to emulate temp memory for PEI. @@ -476,12 +476,12 @@ Returns: TemporaryRamSize = TEMPORARY_RAM_SIZE; TemporaryRam = VirtualAlloc (NULL, (SIZE_T) (TemporaryRamSize), MEM_COMMIT, PAGE_EXECUTE_READWRITE); if (TemporaryRam == NULL) { - SecPrint ("ERROR : Can not allocate enough space for SecStack\n"); + SecPrint ("ERROR : Can not allocate enough space for SecStack\n\r"); exit (1); } SetMem32 (TemporaryRam, TemporaryRamSize, PcdGet32 (PcdInitValueInTempStack)); - SecPrint (" OS Emulator passing in %u KB of temp RAM at 0x%08lx to SEC\n", + SecPrint (" OS Emulator passing in %u KB of temp RAM at 0x%08lx to SEC\n\r", TemporaryRamSize / SIZE_1KB, TemporaryRam ); @@ -503,7 +503,7 @@ Returns: &Size ); if (EFI_ERROR (Status)) { - SecPrint ("ERROR : Could not allocate PeiServicesTablePage @ %p\n", EmuMagicPage); + SecPrint ("ERROR : Could not allocate PeiServicesTablePage @ %p\n\r", EmuMagicPage); return EFI_DEVICE_ERROR; } } @@ -514,7 +514,7 @@ Returns: // FileNamePtr = AllocateCopyPool (StrSize (FirmwareVolumesStr), FirmwareVolumesStr); if (FileNamePtr == NULL) { - SecPrint ("ERROR : Can not allocate memory for firmware volume string\n"); + SecPrint ("ERROR : Can not allocate memory for firmware volume string\n\r"); exit (1); } @@ -540,11 +540,11 @@ Returns: &gFdInfo[Index].Size ); if (EFI_ERROR (Status)) { - SecPrint ("ERROR : Can not open Firmware Device File %S (0x%X). Exiting.\n", FileName, Status); + SecPrint ("ERROR : Can not open Firmware Device File %S (0x%X). Exiting.\n\r", FileName, Status); exit (1); } - SecPrint (" FD loaded from %S\n", FileName); + SecPrint (" FD loaded from %S", FileName); if (SecFile == NULL) { // @@ -565,7 +565,7 @@ Returns: } } - SecPrint ("\n"); + SecPrint ("\n\r"); } // // Calculate memory regions and store the information in the gSystemMemory @@ -590,7 +590,7 @@ Returns: MemorySizeStr = MemorySizeStr + Index1 + 1; } - SecPrint ("\n"); + SecPrint ("\n\r"); // // Hand off to SEC Core @@ -601,7 +601,7 @@ Returns: // If we get here, then the SEC Core returned. This is an error as SEC should // always hand off to PEI Core and then on to DXE Core. // - SecPrint ("ERROR : SEC returned\n"); + SecPrint ("ERROR : SEC returned\n\r"); exit (1); } -- 2.21.0.windows.1