From nobody Sun Feb 8 12:39:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+92056+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+92056+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linux.microsoft.com ARC-Seal: i=1; a=rsa-sha256; t=1659463497; cv=none; d=zohomail.com; s=zohoarc; b=InQcjm32Pqy/RH8ZvkUTbTZZ+NtUQuM/e/lb6kwzespfNswSc8LD7C4qb9yphyyS85hD4oUemwyWPSHQea+24+fiEOMTJwGQOUtqUEV9ImpwT/v1k248gkcLIPGnfWASfu/U4JySz5/Cct5fXt/C9aMuvxscN9nmQK50q2AvkF4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659463497; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=vGFmFbomnnnnL4C1q67MBvLdAKkM3iGaB2yIb3wTVNA=; b=ko6/PqA0HL4hPMSHchud+LCtUBCJ7yeNDpIvqRnDO3MAVzvreeJdmzLQNaZQvYRBrAnv+ICQ7PRDjXDjYVFZTMpkFUY2jyqkYtGZOyYOEx7jrKF/30v5As5UAxGzA42A9VvoL0EjyNc6JhxLKhGaxLBRtpKmfQamzH7prKAiSYU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+92056+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1659463497134868.9994714302019; Tue, 2 Aug 2022 11:04:57 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ScojYY1788612xCaRIYZiAEr; Tue, 02 Aug 2022 11:04:56 -0700 X-Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web10.9701.1659463496288972346 for ; Tue, 02 Aug 2022 11:04:56 -0700 X-Received: from localhost.localdomain (unknown [47.195.228.134]) by linux.microsoft.com (Postfix) with ESMTPSA id 25E1820FF4EA; Tue, 2 Aug 2022 11:04:55 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 25E1820FF4EA From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Dandan Bi , Guomin Jiang , Hao A Wu , Jian J Wang , Liming Gao , Ray Ni Subject: [edk2-devel] [PATCH v1 3/5] MdeModulePkg: Fix imbalanced debug macros Date: Tue, 2 Aug 2022 14:04:16 -0400 Message-Id: <20220802180418.880-4-mikuback@linux.microsoft.com> In-Reply-To: <20220802180418.880-1-mikuback@linux.microsoft.com> References: <20220802180418.880-1-mikuback@linux.microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,mikuback@linux.microsoft.com X-Gm-Message-State: vdsealMaLphzsRZ7fosHCawdx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1659463496; bh=eezPO5ujakgJ4f4JjQyt6BiLCB2LfT6IoGbGSFJvPU0=; h=Cc:Date:From:Reply-To:Subject:To; b=Q8lpkPaSSDuTwWsT3a4jyrfrQ69Ytbyh0SKkMfqMVICFB8vddDsY35S4Ab6sIn689cl FBSRHqCYJSCipTwgMxTsVbdqAeMFHdeFvD3sO88fAkm+R/XSTa6Xpg7ea3sOVPsokz15m MBeo4nKNGl3wb6KHoFS3E8Q0txvlcmhuSh8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1659463499412100007 Content-Type: text/plain; charset="utf-8" From: Michael Kubacki Updates debug macros in the package that have an imbalanced number of print specifiers to arguments. These changes try to preserve what was likely intended by the author. In cases information was missing due to the bug, the specifier may be removed since it was not previously accurately printing the expected value. Cc: Dandan Bi Cc: Guomin Jiang Cc: Hao A Wu Cc: Jian J Wang Cc: Liming Gao Cc: Liming Gao Cc: Ray Ni Signed-off-by: Michael Kubacki Reviewed-by: Hao A Wu Reviewed-by: Liming Gao --- MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c = | 2 +- MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c = | 8 ++++---- MdeModulePkg/Core/Dxe/Image/Image.c = | 2 +- MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgres= sLibGraphics.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c b/MdeModulePk= g/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c index 53b63ab52b93..dd45167a009e 100644 --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c @@ -64,7 +64,7 @@ DumpCapabilityReg ( DEBUG ((DEBUG_INFO, " Driver Type D %a\n", Capability->DriverTypeD= ? "TRUE" : "FALSE")); DEBUG ((DEBUG_INFO, " Driver Type 4 %a\n", Capability->DriverType4= ? "TRUE" : "FALSE")); if (Capability->TimerCount =3D=3D 0) { - DEBUG ((DEBUG_INFO, " Retuning TimerCnt Disabled\n", 2 * (Capability= ->TimerCount - 1))); + DEBUG ((DEBUG_INFO, " Retuning TimerCnt Disabled\n")); } else { DEBUG ((DEBUG_INFO, " Retuning TimerCnt %dseconds\n", 2 * (Capabilit= y->TimerCount - 1))); } diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c b/MdeModulePkg/Bus/= Usb/UsbBusDxe/UsbEnumer.c index 5495b324b381..aed34596f469 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c @@ -941,7 +941,7 @@ UsbEnumeratePort ( // which probably is caused by short circuit. It has to wait syste= m hardware // to perform recovery. // - DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: Critical Over Current\n", Po= rt)); + DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: Critical Over Current (port = %d)\n", Port)); return EFI_DEVICE_ERROR; } =20 @@ -951,7 +951,7 @@ UsbEnumeratePort ( // over current. As a result, all ports are nearly power-off, so // it's necessary to detach and enumerate all ports again. // - DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: 2.0 device Recovery Over Curre= nt\n", Port)); + DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: 2.0 device Recovery Over Curre= nt (port %d)\n", Port)); } =20 if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_ENABLE))= { @@ -961,7 +961,7 @@ UsbEnumeratePort ( // on 2.0 roothub does. When over-current has influence on 1.1 devic= e, the port // would be disabled, so it's also necessary to detach and enumerate= again. // - DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: 1.1 device Recovery Over Curre= nt\n", Port)); + DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: 1.1 device Recovery Over Curre= nt (port %d)\n", Port)); } =20 if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_CONNECTI= ON)) { @@ -969,7 +969,7 @@ UsbEnumeratePort ( // Case4: // Device connected or disconnected normally. // - DEBUG ((DEBUG_INFO, "UsbEnumeratePort: Device Connect/Disconnect Norma= lly\n", Port)); + DEBUG ((DEBUG_INFO, "UsbEnumeratePort: Device Connect/Disconnect Norma= lly (port %d)\n", Port)); } =20 // diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Im= age/Image.c index 68bde5c15c52..06cc6744b8c6 100644 --- a/MdeModulePkg/Core/Dxe/Image/Image.c +++ b/MdeModulePkg/Core/Dxe/Image/Image.c @@ -1741,7 +1741,7 @@ CoreStartImage ( if ((Image->ExitDataSize !=3D 0) || (Image->ExitData !=3D NULL)) { DEBUG ((DEBUG_LOAD, "StartImage: ExitDataSize %d, ExitData %p", (UINT3= 2)Image->ExitDataSize, Image->ExitData)); if (Image->ExitData !=3D NULL) { - DEBUG ((DEBUG_LOAD, " (%hs)", Image->ExitData)); + DEBUG ((DEBUG_LOAD, " (%s)", Image->ExitData)); } =20 DEBUG ((DEBUG_LOAD, "\n")); diff --git a/MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayU= pdateProgressLibGraphics.c b/MdeModulePkg/Library/DisplayUpdateProgressLibG= raphics/DisplayUpdateProgressLibGraphics.c index 83053464e06e..6b012fed35db 100644 --- a/MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdatePr= ogressLibGraphics.c +++ b/MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdatePr= ogressLibGraphics.c @@ -148,7 +148,7 @@ FindDim ( (VOID **)&BootLogo ); if ((BootLogo =3D=3D NULL) || (EFI_ERROR (Status))) { - DEBUG ((DEBUG_ERROR, "Failed to locate gEdkiiBootLogo2ProtocolGuid. N= o Progress bar support. \n", Status)); + DEBUG ((DEBUG_ERROR, "Failed to locate gEdkiiBootLogo2ProtocolGuid Sta= tus =3D %r. No Progress bar support. \n", Status)); return; } =20 --=20 2.28.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#92056): https://edk2.groups.io/g/devel/message/92056 Mute This Topic: https://groups.io/mt/92776309/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-