[edk2-devel] [PATCH v3 0/8] Fix imbalanced debug macros

Michael Kubacki posted 8 patches 1 year, 7 months ago
Failed in applying to current master (apply log)
ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashBlockIoDxe.c                                  |  4 ++--
DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c                         |  3 +--
FatPkg/FatPei/Gpt.c                                                                      |  2 +-
MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.c                                       |  2 +-
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c                                         |  2 +-
MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c                                               |  8 ++++----
MdeModulePkg/Core/Dxe/Image/Image.c                                                      |  2 +-
MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.c |  2 +-
MdeModulePkg/Universal/CapsulePei/UefiCapsule.c                                          |  2 +-
NetworkPkg/TcpDxe/SockInterface.c                                                        | 12 ++----------
OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c                                              |  6 +++---
RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c                                       |  6 +++---
RedfishPkg/RedfishHostInterfaceDxe/RedfishHostInterfaceDxe.c                             |  2 +-
RedfishPkg/RedfishRestExDxe/RedfishRestExProtocol.c                                      |  2 +-
SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/MmTcg2PhysicalPresenceLibCommon.c         |  2 +-
15 files changed, 24 insertions(+), 33 deletions(-)
[edk2-devel] [PATCH v3 0/8] Fix imbalanced debug macros
Posted by Michael Kubacki 1 year, 7 months ago
From: Michael Kubacki <michael.kubacki@microsoft.com>

After noticing a few occurrences of DEBUG macros with a mismatched
number of arguments, I wrote a script to automatically detect this.

This patch series is the result of matches found by the script.

In some cases it is not obvious what was originally intended so I
have attempted to capture what I believe was the original author's
intention.

V3 Changes:
Updated R-b tags.
1. ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashBlockIoDxe.c:
   - Repeated BufferSizeInBytes argument per Leif's feedback
2. MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.c:
   - Fixed an additional error on Line 267

V2 Changes:
These additional errors were found while finishing testing of
the script.

1. Add DynamicTablesPkg/AcpiPpttLibArm patch for the change in
   - DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c
2. Update MdeModulePkg patch to include the change in
   - MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
3. Add following to the RedfishPkg fix patch:
   - RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c
   - RedfishPkg/RedfishHostInterfaceDxe/RedfishHostInterfaceDxe.c
4. Add NetworkPkg patch for the change in
   - NetworkPkg/TcpDxe/SockInterface.c
5. Add OvmfPkg patch for the change in
   - OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c

Cc: Abner Chang <abner.chang@amd.com>
Cc: Alexei Fedorov <Alexei.Fedorov@arm.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Dandan Bi <dandan.bi@intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
Cc: Nickle Wang <nickle.wang@hpe.com>
Cc: Qi Zhang <qi1.zhang@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Sami Mujawar <Sami.Mujawar@arm.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>

Michael Kubacki (8):
  ArmPlatformPkg/NorFlashDxe: Remove unused debug print specifier
  FatPkg/FatPei: Remove extraneous debug message argument
  MdeModulePkg: Fix imbalanced debug macros
  RedfishPkg/RedfishRestExDxe: Remove extra debug macro argument
  SecurityPkg/SmmTcg2PhysicalPresenceLib: Add missing debug print
    specifier
  DynamicTablesPkg/AcpiPpttLibArm: Fix debug macro arguments
  NetworkPkg/TcpDxe: Fix debug macro arguments
  OvmfPkg/LegacyBootManagerLib: Fix debug macro arguments

 ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashBlockIoDxe.c                                  |  4 ++--
 DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c                         |  3 +--
 FatPkg/FatPei/Gpt.c                                                                      |  2 +-
 MdeModulePkg/Bus/Pci/NvmExpressPei/NvmExpressPei.c                                       |  2 +-
 MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c                                         |  2 +-
 MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c                                               |  8 ++++----
 MdeModulePkg/Core/Dxe/Image/Image.c                                                      |  2 +-
 MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.c |  2 +-
 MdeModulePkg/Universal/CapsulePei/UefiCapsule.c                                          |  2 +-
 NetworkPkg/TcpDxe/SockInterface.c                                                        | 12 ++----------
 OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c                                              |  6 +++---
 RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c                                       |  6 +++---
 RedfishPkg/RedfishHostInterfaceDxe/RedfishHostInterfaceDxe.c                             |  2 +-
 RedfishPkg/RedfishRestExDxe/RedfishRestExProtocol.c                                      |  2 +-
 SecurityPkg/Library/SmmTcg2PhysicalPresenceLib/MmTcg2PhysicalPresenceLibCommon.c         |  2 +-
 15 files changed, 24 insertions(+), 33 deletions(-)

-- 
2.28.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#93104): https://edk2.groups.io/g/devel/message/93104
Mute This Topic: https://groups.io/mt/93429907/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-