Fix "use of logical '&&' with constant operand" error when built with CLANG38 toolchain.
Signed-off-by: Vijayenthiran Subramaniam <vijayenthiran.subraman...@arm.com> --- Notes: Fix Clan error reported by Leif in https://edk2.groups.io/g/devel/message/54586. Build tested with clang 9: CLANG38_AARCH64_PREFIX=aarch64-linux-gnu- build -n $NUM_CPUS -a AARCH64 \ -t CLANG38 -p Platform/ARM/SgiPkg/SgiPlatform.dsc Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c index 9e5f7e704e24..d8af525f52b1 100644 --- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c +++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c @@ -81,8 +81,8 @@ InitVirtioDevices ( STATIC EFI_HANDLE mVirtIoNetController = NULL; // Install protocol interface for storage device - if ((FeaturePcdGet (PcdVirtioBlkSupported)) && - (FixedPcdGet32 (PcdVirtioBlkBaseAddress))) { + if ((FeaturePcdGet (PcdVirtioBlkSupported) == TRUE) && + (FixedPcdGet32 (PcdVirtioBlkBaseAddress) != 0)) { Status = gBS->InstallProtocolInterface (&mVirtIoBlkController, &gEfiDevicePathProtocolGuid, EFI_NATIVE_INTERFACE, &mVirtioBlockDevicePath); @@ -110,8 +110,8 @@ InitVirtioDevices ( } // Install protocol interface for network device - if ((FeaturePcdGet (PcdVirtioNetSupported)) && - (FixedPcdGet32 (PcdVirtioNetBaseAddress))) { + if ((FeaturePcdGet (PcdVirtioNetSupported) == TRUE) && + (FixedPcdGet32 (PcdVirtioNetBaseAddress) != 0)) { Status = gBS->InstallProtocolInterface (&mVirtIoNetController, &gEfiDevicePathProtocolGuid, EFI_NATIVE_INTERFACE, &mVirtioNetDevicePath); -- 2.7.4 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#54614): https://edk2.groups.io/g/devel/message/54614 Mute This Topic: https://groups.io/mt/71391794/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-