From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.groups.io with SMTP id smtpd.web10.1385.1571738603833040562 for ; Tue, 22 Oct 2019 03:03:23 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: redhat.com, ip: 209.132.183.28, mailfrom: philmd@redhat.com) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E62CE85538 for ; Tue, 22 Oct 2019 10:03:22 +0000 (UTC) Received: by mail-wr1-f71.google.com with SMTP id e25so8315153wra.9 for ; Tue, 22 Oct 2019 03:03:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=/S2nfRlhovlA5UXZxeLgfa4qOc21hyTKnhqOe3pIqQM=; b=auHUFgFh+iNqHNp6FpBwzUPCsezWTV3gdgF5fEL4/VzDsLBpKUQ7uoGh9Ad7QXGO7w cjBBTYGh9iGLBYPv/M+rceThlpk+SrSaNaK5jDFCrbnARdeJSyeCUez98qqPKqUlkuSC ZCAIfNNgxHoJ6OwSKqqjlWtMxM/Y9+H+CM6sUop+sEumyj2A1VkPxD3Mdk5kDZo8vOQH bkH6KKhCkEOkeHViHGP/3eUsv51wF5YvlQ6DNtZJN1Ed9CqhDs/UkVJfZ+jZTa+Znp0J chMCwFi5wdfHX/jx4f4B2dedviadf/HD93m6LxwI4VH+iF38D6iHjtDuiIPPjrZnD4t7 XSPQ== X-Gm-Message-State: APjAAAWJWS2ya76b95AxQPvNEeVAjVcP7sMb6on/J0C/j2jFMsYWXsRV eSRdymx8Eub3f0CONxp9VYWebqUdGxkD25wIHR5fGPbJ8u49U8jg7e3JjlYUrG55jOcqEDa+Y6d Rg3aZcUADCqZHIg== X-Received: by 2002:a05:6000:1051:: with SMTP id c17mr2607481wrx.124.1571738601483; Tue, 22 Oct 2019 03:03:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqx49wMcLdUhdUeD3K0XT0z4xURLX9DEMBD7IU0Zf7BjdKNkvd0w7cF6rDLpWyv4LIrPeWcw7w== X-Received: by 2002:a05:6000:1051:: with SMTP id c17mr2607430wrx.124.1571738601033; Tue, 22 Oct 2019 03:03:21 -0700 (PDT) Received: from [192.168.1.41] (129.red-83-57-174.dynamicip.rima-tde.net. [83.57.174.129]) by smtp.gmail.com with ESMTPSA id v9sm4038605wro.51.2019.10.22.03.03.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 22 Oct 2019 03:03:20 -0700 (PDT) Subject: Re: [edk2-devel] [PATCH v2] OvmfPkg: Make SOURCE_DEBUG_ENABLE actually need to be set to TRUE To: devel@edk2.groups.io, lersek@redhat.com Cc: Andrew Fish , Anthony Perard , Ard Biesheuvel , Jordan Justen , Julien Grall , Leif Lindholm , Michael Kinney , Peter Jones References: <20191021201320.24413-1-lersek@redhat.com> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Message-ID: <9ee23e60-440d-05d6-559d-1ce9ebab780c@redhat.com> Date: Tue, 22 Oct 2019 12:03:19 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20191021201320.24413-1-lersek@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit On 10/21/19 10:13 PM, Laszlo Ersek wrote: > From: Peter Jones > > Currently some tests check the value of SOURCE_DEBUG_ENABLE, and some > tests check if it's defined or not. Additionally, in UefiPayloadPkg as > well as some other trees, we define it as FALSE in the .dsc file. > > This patch changes all of the Ovmf platforms to explicitly define it as > FALSE by default, and changes all of the checks to test if the value is > TRUE. > > Signed-off-by: Peter Jones > Message-Id: <20190920184507.909884-1-pjones@redhat.com> > [lersek@redhat.com: drop Contributed-under line, per TianoCore BZ#1373] > [lersek@redhat.com: replace "!= TRUE" with more idiomatic "== FALSE"] > Cc: Andrew Fish > Cc: Anthony Perard > Cc: Ard Biesheuvel > Cc: Jordan Justen > Cc: Julien Grall > Cc: Leif Lindholm > Cc: Michael Kinney > Cc: Peter Jones > Signed-off-by: Laszlo Ersek > --- > > Notes: > v2: > > - repo: https://github.com/lersek/edk2.git > branch: src_dbg_true_v2 > > - repost the patch in Peter's stead, with the updates requested at > > > - per discussion with the other stewards, it's OK to explicitly resubmit > the patch (noting the original authorship) with the Contributed-under > line removed > > OvmfPkg/OvmfPkgIa32.dsc | 17 +++++++++-------- > OvmfPkg/OvmfPkgIa32X64.dsc | 19 ++++++++++--------- > OvmfPkg/OvmfPkgX64.dsc | 19 ++++++++++--------- > OvmfPkg/OvmfXen.dsc | 17 +++++++++-------- > OvmfPkg/OvmfPkgIa32.fdf | 2 +- > OvmfPkg/OvmfPkgIa32X64.fdf | 2 +- > OvmfPkg/OvmfPkgX64.fdf | 2 +- > OvmfPkg/OvmfXen.fdf | 2 +- > 8 files changed, 42 insertions(+), 38 deletions(-) > > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index 66e944436a69..4301e7821902 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -30,6 +30,7 @@ [Defines] > # > DEFINE SECURE_BOOT_ENABLE = FALSE > DEFINE SMM_REQUIRE = FALSE > + DEFINE SOURCE_DEBUG_ENABLE = FALSE > DEFINE TPM2_ENABLE = FALSE > DEFINE TPM2_CONFIG_ENABLE = FALSE > > @@ -157,7 +158,7 @@ [LibraryClasses] > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf > FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf > > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf > DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf > !else > @@ -225,7 +226,7 @@ [LibraryClasses.common.SEC] > !endif > ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf > ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf > !endif > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > @@ -267,7 +268,7 @@ [LibraryClasses.common.PEIM] > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf > ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf > @@ -292,7 +293,7 @@ [LibraryClasses.common.DXE_CORE] > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf > @@ -351,7 +352,7 @@ [LibraryClasses.common.DXE_DRIVER] > !else > LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf > !endif > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf > !endif > PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > @@ -389,7 +390,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER] > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf > !endif > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf > @@ -481,7 +482,7 @@ [PcdsFixedAtBuild] > # DEBUG_ERROR 0x80000000 // Error > gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F > > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 > !else > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F > @@ -495,7 +496,7 @@ [PcdsFixedAtBuild] > # never lets the RAM below 4 GB exceed 2816 MB. > gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000 > > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2 > !endif > > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 51c2bfb44f14..803fd74ae8e4 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -30,6 +30,7 @@ [Defines] > # > DEFINE SECURE_BOOT_ENABLE = FALSE > DEFINE SMM_REQUIRE = FALSE > + DEFINE SOURCE_DEBUG_ENABLE = FALSE > DEFINE TPM2_ENABLE = FALSE > DEFINE TPM2_CONFIG_ENABLE = FALSE > > @@ -69,7 +70,7 @@ [BuildOptions] > !if $(TOOL_CHAIN_TAG) != "XCODE5" > GCC:*_*_*_CC_FLAGS = -mno-mmx -mno-sse > !endif > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > MSFT:*_*_X64_GENFW_FLAGS = --keepexceptiontable > GCC:*_*_X64_GENFW_FLAGS = --keepexceptiontable > INTEL:*_*_X64_GENFW_FLAGS = --keepexceptiontable > @@ -162,7 +163,7 @@ [LibraryClasses] > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf > FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf > > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf > DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf > !else > @@ -230,7 +231,7 @@ [LibraryClasses.common.SEC] > !endif > ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf > ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf > !endif > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > @@ -272,7 +273,7 @@ [LibraryClasses.common.PEIM] > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf > ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf > @@ -297,7 +298,7 @@ [LibraryClasses.common.DXE_CORE] > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf > @@ -356,7 +357,7 @@ [LibraryClasses.common.DXE_DRIVER] > !else > LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf > !endif > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf > !endif > PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > @@ -394,7 +395,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER] > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf > !endif > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf > @@ -486,7 +487,7 @@ [PcdsFixedAtBuild] > # DEBUG_ERROR 0x80000000 // Error > gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F > > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 > !else > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F > @@ -500,7 +501,7 @@ [PcdsFixedAtBuild] > # never lets the RAM below 4 GB exceed 2816 MB. > gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000 > > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2 > !endif > > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index ba7a75884490..5dbd1b793a90 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -30,6 +30,7 @@ [Defines] > # > DEFINE SECURE_BOOT_ENABLE = FALSE > DEFINE SMM_REQUIRE = FALSE > + DEFINE SOURCE_DEBUG_ENABLE = FALSE > DEFINE TPM2_ENABLE = FALSE > DEFINE TPM2_CONFIG_ENABLE = FALSE > > @@ -69,7 +70,7 @@ [BuildOptions] > !if $(TOOL_CHAIN_TAG) != "XCODE5" > GCC:*_*_*_CC_FLAGS = -mno-mmx -mno-sse > !endif > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > MSFT:*_*_X64_GENFW_FLAGS = --keepexceptiontable > GCC:*_*_X64_GENFW_FLAGS = --keepexceptiontable > INTEL:*_*_X64_GENFW_FLAGS = --keepexceptiontable > @@ -162,7 +163,7 @@ [LibraryClasses] > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf > FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf > > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf > DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf > !else > @@ -230,7 +231,7 @@ [LibraryClasses.common.SEC] > !endif > ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf > ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf > !endif > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > @@ -272,7 +273,7 @@ [LibraryClasses.common.PEIM] > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf > ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf > @@ -297,7 +298,7 @@ [LibraryClasses.common.DXE_CORE] > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf > @@ -356,7 +357,7 @@ [LibraryClasses.common.DXE_DRIVER] > !else > LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf > !endif > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf > !endif > PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > @@ -394,7 +395,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER] > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf > !endif > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf > @@ -486,7 +487,7 @@ [PcdsFixedAtBuild] > # DEBUG_ERROR 0x80000000 // Error > gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F > > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 > !else > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F > @@ -500,7 +501,7 @@ [PcdsFixedAtBuild] > # never lets the RAM below 4 GB exceed 2816 MB. > gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000 > > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2 > !endif > > diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc > index 5a31f75f05d0..8c11efe9b709 100644 > --- a/OvmfPkg/OvmfXen.dsc > +++ b/OvmfPkg/OvmfXen.dsc > @@ -29,6 +29,7 @@ [Defines] > # Defines for default states. These can be changed on the command line. > # -D FLAG=VALUE > # > + DEFINE SOURCE_DEBUG_ENABLE = FALSE > > # > # Network definition > @@ -66,7 +67,7 @@ [BuildOptions] > !if $(TOOL_CHAIN_TAG) != "XCODE5" > GCC:*_*_*_CC_FLAGS = -mno-mmx -mno-sse > !endif > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > MSFT:*_*_X64_GENFW_FLAGS = --keepexceptiontable > GCC:*_*_X64_GENFW_FLAGS = --keepexceptiontable > INTEL:*_*_X64_GENFW_FLAGS = --keepexceptiontable > @@ -156,7 +157,7 @@ [LibraryClasses] > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf > FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf > > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf > DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf > !else > @@ -213,7 +214,7 @@ [LibraryClasses.common.SEC] > !endif > ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf > ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf > !endif > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > @@ -255,7 +256,7 @@ [LibraryClasses.common.PEIM] > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf > ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf > @@ -275,7 +276,7 @@ [LibraryClasses.common.DXE_CORE] > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > !endif > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf > @@ -327,7 +328,7 @@ [LibraryClasses.common.DXE_DRIVER] > QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf > LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf > !endif > PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > @@ -412,7 +413,7 @@ [PcdsFixedAtBuild] > # DEBUG_ERROR 0x80000000 // Error > gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F > > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 > !else > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F > @@ -426,7 +427,7 @@ [PcdsFixedAtBuild] > # never lets the RAM below 4 GB exceed 2816 MB. > gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000 > > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == TRUE > gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2 > !endif > > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > index 785affeb90c8..586bbff08585 100644 > --- a/OvmfPkg/OvmfPkgIa32.fdf > +++ b/OvmfPkg/OvmfPkgIa32.fdf > @@ -260,7 +260,7 @@ [FV.DXEFV] > INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf > > INF OvmfPkg/SioBusDxe/SioBusDxe.inf > -!ifndef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == FALSE > INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > !endif > INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf > index 74407072563b..e49adc425fce 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.fdf > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf > @@ -261,7 +261,7 @@ [FV.DXEFV] > INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf > > INF OvmfPkg/SioBusDxe/SioBusDxe.inf > -!ifndef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == FALSE > INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > !endif > INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf > index 74407072563b..e49adc425fce 100644 > --- a/OvmfPkg/OvmfPkgX64.fdf > +++ b/OvmfPkg/OvmfPkgX64.fdf > @@ -261,7 +261,7 @@ [FV.DXEFV] > INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf > > INF OvmfPkg/SioBusDxe/SioBusDxe.inf > -!ifndef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == FALSE > INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > !endif > INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf > index e6e9e184ef04..05138ffc5b4f 100644 > --- a/OvmfPkg/OvmfXen.fdf > +++ b/OvmfPkg/OvmfXen.fdf > @@ -343,7 +343,7 @@ [FV.DXEFV] > INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf > > INF OvmfPkg/SioBusDxe/SioBusDxe.inf > -!ifndef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) == FALSE > INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > !endif > INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > Reviewed-by: Philippe Mathieu-Daude