From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.web08.620.1635792802450290803 for ; Mon, 01 Nov 2021 11:53:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20210112.gappssmtp.com header.s=20210112 header.b=2KOBsPZg; spf=pass (domain: nuviainc.com, ip: 209.85.221.44, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f44.google.com with SMTP id b12so25042569wrh.4 for ; Mon, 01 Nov 2021 11:53:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=kWkTCKTlwU0zTk/Sjks007zdy1qIlU8WwF8VyXhD26g=; b=2KOBsPZgyYEhwmgAFKJRvJoUr3q1J3b4TtWVDisQbTO+wuUUvFADVgsSl/4hfmwAeC foE70JsRYkpxGGrEul6O4vtxPApZgUPo1koWzeuqMbjOPlbipokpnuQM+FF4rhkNPasU IwHZfVxOlzBleeSw1VYJvwiIwj0HGjrtZiYsxTKy64fwKGEDmWfJjWFvp60tVz8XEmVZ T0DBeEoRZhc4elhHvg4VYdpCBX7t5LPLxTAHf33w7U/WMTyPk589BbyqC3Q2uFTWZ0Ub t9MJumode0iL/DJRXkWz/OKTmqVoX1XtuU15/oigvD+kzK1N4l8R+aGb+Ep5+MCsf/FQ TcMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=kWkTCKTlwU0zTk/Sjks007zdy1qIlU8WwF8VyXhD26g=; b=FttZBKqkfE6xp3yU/D8XJlso8acn2BFb7JBQFgwVoPZGF45MbFILfXxDUV9TsOwB9A JgGv8GzxS0Ed5JVfFSpao6wamX0YDHfeRZDBJo1I2B4b7zSoF8oTs+1lrYWZSeIockfH M3GCf4H8lBCecOYwA9AgxBfDFs2MJ6AkehEHbo/sD6po1TdodkOH/I1m8ma+T6lItiul t3kdu7DO9funebXwWqRMOlgzZiaHnozF3DXWnR63cPaFRdbW8BLUhDJJYKbrKZa1hJlP E3+aU/aM1kmyJ3gWCuaswEaHypT3otcbLUbgqLRaHz08GxgPD8fX4WFfZXcdnORmVYOG Vkiw== X-Gm-Message-State: AOAM531uQyTfVR7LAvgooOyGdfBDOu1kGoDm05R+GVP1ozfpCOCHU4dJ QwQ92gqCyc4GN3CzU9zH+dhMlKeUOm4h7+iL7vEYgm+WGecvlVX41frNn9UJLpAVv+aqsgaYaA7 S4TTkoCr/EIn7YX/+tmUsHZxn5TtBlkgP2z5Iv99tDbNCirqrnlXK462s0IDGLrlBKsx2 X-Google-Smtp-Source: ABdhPJw+a3Vo+A+1h7zzPLAHEK9z0uFTmkVLkuUTCP8MkaVrVU7o836ue3+H0CtpaGKfo5h5TN2gGA== X-Received: by 2002:adf:c183:: with SMTP id x3mr40609369wre.90.1635792800826; Mon, 01 Nov 2021 11:53:20 -0700 (PDT) Return-Path: Received: from leviathan (cpc92314-cmbg19-2-0-cust559.5-4.cable.virginm.net. [82.11.186.48]) by smtp.gmail.com with ESMTPSA id t127sm352229wma.9.2021.11.01.11.53.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 11:53:20 -0700 (PDT) Date: Mon, 1 Nov 2021 18:53:18 +0000 From: "Leif Lindholm" To: devel@edk2.groups.io, michael.d.kinney@intel.com Cc: Ard Biesheuvel , Michael Kubacki Subject: Re: [edk2-devel] [Patch 2/6] ArmPkg: Reproduce builds across source format changes Message-ID: <20211101185318.dsibibbdwcfcrhxn@leviathan> References: <20211101182942.321-1-michael.d.kinney@intel.com> <20211101182942.321-3-michael.d.kinney@intel.com> MIME-Version: 1.0 In-Reply-To: <20211101182942.321-3-michael.d.kinney@intel.com> Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Nov 01, 2021 at 11:29:38 -0700, Michael D Kinney wrote: > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3688 > > Use DEBUG_LINE_NUMBER instead of __LINE__. > > Cc: Leif Lindholm > Cc: Ard Biesheuvel > Cc: Michael Kubacki > Signed-off-by: Michael D Kinney Reviewed-by: Leif Lindholm > --- > .../Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c | 2 +- > .../Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c | 2 +- > .../SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c | 2 +- > .../SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c | 2 +- > .../SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c | 2 +- > .../Type13/MiscNumberOfInstallableLanguagesFunction.c | 2 +- > .../Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c | 2 +- > 7 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c > index 4b409ff7458c..cbdf6df01ee0 100644 > --- a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c > +++ b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c > @@ -689,7 +689,7 @@ AddSmbiosProcessorTypeTable ( > > if (EFI_ERROR (Status)) { > DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type04 Table Log Failed! %r \n", > - __FUNCTION__, __LINE__, Status)); > + __FUNCTION__, DEBUG_LINE_NUMBER, Status)); > } > FreePool (Type4Record); > > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c > index 5679ebaac8a5..2506c03d64b1 100644 > --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c > @@ -271,7 +271,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) > Status = SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL); > if (EFI_ERROR (Status)) { > DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type00 Table Log Failed! %r \n", > - __FUNCTION__, __LINE__, Status)); > + __FUNCTION__, DEBUG_LINE_NUMBER, Status)); > } > > FreePool (SmbiosRecord); > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c > index 2c69c2593f5d..555557a2a946 100644 > --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c > @@ -162,7 +162,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscSystemManufacturer) > Status = SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL); > if (EFI_ERROR (Status)) { > DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type01 Table Log Failed! %r \n", > - __FUNCTION__, __LINE__, Status)); > + __FUNCTION__, DEBUG_LINE_NUMBER, Status)); > } > > FreePool (SmbiosRecord); > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c > index 097777a23904..f11295b199b3 100644 > --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c > @@ -196,7 +196,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscBaseBoardManufacturer) > Status = SmbiosMiscAddRecord ((UINT8 *)SmbiosRecord, NULL); > if (EFI_ERROR (Status)) { > DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type02 Table Log Failed! %r \n", > - __FUNCTION__, __LINE__, Status)); > + __FUNCTION__, DEBUG_LINE_NUMBER, Status)); > } > > FreePool (SmbiosRecord); > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c > index 66e3e5327fc3..d64046182b96 100644 > --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c > @@ -178,7 +178,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscChassisManufacturer) > Status = SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL); > if (EFI_ERROR (Status)) { > DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type03 Table Log Failed! %r \n", > - __FUNCTION__, __LINE__, Status)); > + __FUNCTION__, DEBUG_LINE_NUMBER, Status)); > } > > FreePool (SmbiosRecord); > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c > index 7c941b5c0709..017b410a16d0 100644 > --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c > @@ -158,7 +158,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscNumberOfInstallableLanguages) > Status = SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL); > if (EFI_ERROR (Status)) { > DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type13 Table Log Failed! %r \n", > - __FUNCTION__, __LINE__, Status)); > + __FUNCTION__, DEBUG_LINE_NUMBER, Status)); > } > > FreePool (SmbiosRecord); > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c > index 4be1e1cd29a9..c4ce6a5e7608 100644 > --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c > @@ -68,7 +68,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscBootInformation) > Status = SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL); > if (EFI_ERROR (Status)) { > DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type32 Table Log Failed! %r \n", > - __FUNCTION__, __LINE__, Status)); > + __FUNCTION__, DEBUG_LINE_NUMBER, Status)); > } > > FreePool (SmbiosRecord); > -- > 2.32.0.windows.1 > > > > > >