From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by mx.groups.io with SMTP id smtpd.web11.2431.1619811681373461348 for ; Fri, 30 Apr 2021 12:41:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmx.net header.s=badeba3b8450 header.b=TPgdoISs; spf=pass (domain: gmx.de, ip: 212.227.17.21, mailfrom: xypron.glpk@gmx.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1619811657; bh=9DgP8UyrqtOKY8zTgpzXwW++o8QBMY2mdGWJPnZmEE8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=TPgdoISsv8kdcqycno0oR5vgEmbedMhz7anbcLbCvUxYPzQA5XKexF3PbX7ylZg8a tarb1hs57fZL48fi3MeGCmBuIBDC6RIbp5M20OT1q8bFCwfr0ZvgrpRHJBLmB0IfrL lZh0ybbf2PPe2ZseyjZyYsrajzb1ihDmahV5Rks0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([62.143.247.63]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MRTRN-1lxe6G0gmD-00NPI1; Fri, 30 Apr 2021 21:40:57 +0200 From: "Heinrich Schuchardt" To: EDK II Development Cc: Eric Jin , G Edhaya Chandran , Barton Gao , Arvin Chen , Samer El-Haj-Mahmoud , Heinrich Schuchardt Subject: [PATCH edk2-test 1/1] uefi-sct/SctPkg: correct print code for EFI_MEMORY_TYPE Date: Fri, 30 Apr 2021 21:40:23 +0200 Message-Id: <20210430194023.27008-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:24PVFxPjqqipymbbB436A1HoJsShV5+QUyzTLswhoMHm6UBS9UM dm0g4g6QbcVrTIO08yn03mQZCsdrNodhKzpkxlpByCdBQGgVczwYhQxhX1Acl8DIxUZ9WhA hcVlBaw3n1Ufzwp95caW2j4bUriJY92UDcw5xvVQ8QckorsILKOyBJH51vIWa1/Q77vMWv3 VxGroC/qFKGG91ggBTTGQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:rK70LC0tyvY=:suD4RHaKV4UGFDKNLnAFp1 6BKoCB7z3GVarGU0H7T2u8LcA+q0p3g4dgaTnx+pt6PUyQ6lg6kckGSRyFghDr1ENy9pI8wid bqKCfo1QmMgtgHWvWvUDl4AxPre5uALXsTLygyi4aVRGFc6NHNkv5qn1UMCS3UDgW2L9kE1rb mu4CjiI1Rc/883k9IAbn2uoOY5y4NG4fv8aCU2g3a19JDnrdAkgNgobiRLlqYWlQnCAdx0Td+ ILNBTfeukphugbiy1uplNsiTrflQZXUVBQH1moPk7QWr+GRMoLrnOvnutTASe7MmFm5njD1Aj +C6ufAB0RqNvEITtz+bbtJm+znHly+ocNAdpfJEUkLPBWzthlSolGCuvJMFh/UPX6b+io7904 ATO9hm0IDAh3sAMgnHJLA+HnZ3Ct13LIFHZrBKgfkQoobIItWgci6U6ZjEWiXlH/UDl0A0orc qeNHrkoEA9h6zFb/UX1/j/oJfxNsqwtqx9/dypMarACfn10LDgveaFVU+r/DTuFNGLL2J4VN1 MnUZ1RIu+gjlVBmKgXTnLsqdzH4cSjNSswYuAhixfwleoOiai7eFqRXl6IzNykYY58mGqiEKu FlHSTZTyjFaaN6Dab3zeIonpgRHwV1baNf/j+dektVTKkiKyH8Mx1XsC2Tnd3slLOUMh5hRW8 KiCrIRiep7nqqDCLR4xWF9vCiiyj8FVFK4tljN0XSVqcQtheJyei4H7ut7ecPJQI+zIDrnp47 hn80oML5HPxM3bT0M/veiPGkF/OaTnfjwqsVMGBLYq9YQUQogaV5/K0inQPpRXwrHfvgURW0e iLWtU7brb7U4iZh32eDHnABMrf1iuESDF/avxcLiljhl7dlnK6cW7yJKkPIHGhhCkgktZXbXj Y/R83hp5UovJYk/UMIwST04K1YQM+3DECPzX26N6X1iQb7hTx7kJeDU170gPDnxmsf3mDESsf KOaWqbCvxeDHLw6sw7Xmk8KxO8ijFah156P8DRd0f4S8cIgqc92IRPoQLl/W/R8S0wRVR8U9k 1/QmHwEo2j1CRsqPrWqS+tVoz2UmDvq21c2ux784zghmQlwqPC9jk4wIX6C7HNVduLwZe005X lq9vqVEHl8D7uj8VGpBH8Moljl6KULAm6EV3xRDU77ZEq3QPQSqrSPWDc65CyMobbDnRXveke 5oTWLOiEzKjwiskq8hytPEULbvkATf9MICr1NCT6z9h/RJHTYisy8h06X1J+9yYlZuRAc= Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2284 EFI_MEMORY_TYPE is an enum. SctPrint expects an UINTN when printing with %d. Add missing conversions in MemoryAllocationServicesBBTestFunction. Signed-off-by: Heinrich Schuchardt =2D-- .../MemoryAllocationServicesBBTestFunction.c | 98 +++++++++---------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocati= onServices/BlackBoxTest/MemoryAllocationServicesBBTestFunction.c b/uefi-sc= t/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServices/BlackBoxT= est/MemoryAllocationServicesBBTestFunction.c index bf8cd3b3afa4..e545b3cfc5b8 100644 =2D-- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationSer= vices/BlackBoxTest/MemoryAllocationServicesBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/MemoryAllocationServi= ces/BlackBoxTest/MemoryAllocationServicesBBTestFunction.c @@ -417,7 +417,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (!(Memory & EFI_PAGE_MASK)) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -437,7 +437,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory !=3D 0) { Status =3D gtBS->FreePages ( @@ -455,7 +455,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } } @@ -478,7 +478,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } else { PageNum =3D (UINTN)Descriptor.NumberOfPages; @@ -512,7 +512,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (!(Memory & EFI_PAGE_MASK)) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -532,7 +532,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory <=3D Descriptor.PhysicalStart + SctLShiftU64 (Descriptor.NumberOfPages, EFI_PAGE_SHIFT) - @@ -554,7 +554,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex], + (UINTN)AllocatePagesMemoryType[TypeIndex], Descriptor.PhysicalStart, Descriptor.NumberOfPages, Memory @@ -589,7 +589,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (!(Memory2 & EFI_PAGE_MASK)) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -609,7 +609,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if ( Memory2 <=3D Descriptor.PhysicalStart + SctLShiftU64 (Descriptor.NumberOfPages, EFI_PAGE_SHIFT) - @@ -631,7 +631,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex], + (UINTN)AllocatePagesMemoryType[TypeIndex], Memory2 ); if (Memory !=3D 0) { @@ -650,7 +650,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } } @@ -670,7 +670,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } } @@ -694,7 +694,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } else { PageNum =3D (UINTN)Descriptor.NumberOfPages; @@ -739,7 +739,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (!(Memory & EFI_PAGE_MASK)) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -759,7 +759,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory =3D=3D Start) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -779,7 +779,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory !=3D 0) { Status =3D gtBS->FreePages ( @@ -797,7 +797,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } } @@ -824,7 +824,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } else { PageNum =3D (UINTN)Descriptor.NumberOfPages; @@ -869,7 +869,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (!(Memory & EFI_PAGE_MASK)) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -889,7 +889,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory =3D=3D Start) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -909,7 +909,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory !=3D 0) { Status =3D gtBS->FreePages ( @@ -927,7 +927,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } } @@ -947,7 +947,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } else { PageNum =3D (UINTN)Descriptor.NumberOfPages; @@ -992,7 +992,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (!(Memory & EFI_PAGE_MASK)) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -1012,7 +1012,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory =3D=3D Start + (SctLShiftU64 (PageNum/3, EFI_PAGE_SHIF= T) & 0xFFFFFFFFFFFF0000)) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -1032,7 +1032,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory !=3D 0) { Status =3D gtBS->FreePages ( @@ -1050,7 +1050,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } } @@ -1070,7 +1070,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } else { PageNum =3D (UINTN)Descriptor.NumberOfPages; @@ -1115,7 +1115,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (!(Memory & EFI_PAGE_MASK)) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -1135,7 +1135,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory =3D=3D Start + (SctLShiftU64 (PageNum * 2 / 3, EFI_PAG= E_SHIFT) & 0xFFFFFFFFFFFF0000)) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -1155,7 +1155,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory !=3D 0) { Status =3D gtBS->FreePages ( @@ -1173,7 +1173,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } } @@ -1200,7 +1200,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } else { PageNum =3D (UINTN)Descriptor.NumberOfPages; @@ -1245,7 +1245,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (!(Memory & EFI_PAGE_MASK)) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -1265,7 +1265,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory =3D=3D Start) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -1285,7 +1285,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory !=3D 0) { Status =3D gtBS->FreePages ( @@ -1303,7 +1303,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } } @@ -1323,7 +1323,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } else { PageNum =3D (UINTN)Descriptor.NumberOfPages; @@ -1377,7 +1377,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (!(Memory & EFI_PAGE_MASK)) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -1397,7 +1397,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory =3D=3D Start) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -1417,7 +1417,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory !=3D 0) { if (PageNum !=3D 1) { @@ -1442,7 +1442,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } } @@ -1462,7 +1462,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } else { PageNum =3D (UINTN)Descriptor.NumberOfPages; @@ -1507,7 +1507,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (!(Memory & EFI_PAGE_MASK)) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -1527,7 +1527,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory =3D=3D Start) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -1547,7 +1547,7 @@ BBTestAllocatePagesInterfaceTest ( __FILE__, (UINTN)__LINE__, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); if (Memory !=3D 0) { Status =3D gtBS->FreePages ( @@ -1565,7 +1565,7 @@ BBTestAllocatePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } } @@ -1656,7 +1656,7 @@ BBTestFreePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); continue; } @@ -1685,7 +1685,7 @@ BBTestFreePagesInterfaceTest ( (UINTN)__LINE__, Status, TplArray[Index], - AllocatePagesMemoryType[TypeIndex] + (UINTN)AllocatePagesMemoryType[TypeIndex] ); } =2D- 2.30.2