diff --git a/shared/test/common/libult/linux/drm_mock_prelim_context.cpp b/shared/test/common/libult/linux/drm_mock_prelim_context.cpp index 1ad21a32fe..a65314964d 100644 --- a/shared/test/common/libult/linux/drm_mock_prelim_context.cpp +++ b/shared/test/common/libult/linux/drm_mock_prelim_context.cpp @@ -168,9 +168,9 @@ int DrmMockPrelimContext::handlePrelimRequest(DrmIoctl request, void *arg) { prelim_drm_i915_gem_create_ext_setparam *chunkingSetparamRegion = nullptr; prelim_drm_i915_gem_create_ext_vm_private *vmPrivateExt = nullptr; prelim_drm_i915_gem_create_ext_memory_policy *memPolicyExt = nullptr; - void *next_extension = reinterpret_cast(extension->base.next_extension); - while (next_extension != 0) { - auto *setparamCandidate = reinterpret_cast(next_extension); + void *nextExtension = reinterpret_cast(extension->base.next_extension); + while (nextExtension != 0) { + auto *setparamCandidate = reinterpret_cast(nextExtension); if (setparamCandidate->base.name == PRELIM_I915_GEM_CREATE_EXT_SETPARAM) { if ((setparamCandidate->param.param & PRELIM_I915_PARAM_SET_PAIR) != 0) { pairSetparamRegion = setparamCandidate; @@ -179,19 +179,19 @@ int DrmMockPrelimContext::handlePrelimRequest(DrmIoctl request, void *arg) { } else { return EINVAL; } - next_extension = reinterpret_cast(setparamCandidate->base.next_extension); + nextExtension = reinterpret_cast(setparamCandidate->base.next_extension); continue; } - auto *vmPrivateCandidate = reinterpret_cast(next_extension); + auto *vmPrivateCandidate = reinterpret_cast(nextExtension); if (vmPrivateCandidate->base.name == PRELIM_I915_GEM_CREATE_EXT_VM_PRIVATE) { vmPrivateExt = vmPrivateCandidate; - next_extension = reinterpret_cast(vmPrivateCandidate->base.next_extension); + nextExtension = reinterpret_cast(vmPrivateCandidate->base.next_extension); continue; } - auto *memPolicyCandidate = reinterpret_cast(next_extension); + auto *memPolicyCandidate = reinterpret_cast(nextExtension); if (memPolicyCandidate->base.name == PRELIM_I915_GEM_CREATE_EXT_MEMORY_POLICY) { memPolicyExt = memPolicyCandidate; - next_extension = reinterpret_cast(memPolicyCandidate->base.next_extension); + nextExtension = reinterpret_cast(memPolicyCandidate->base.next_extension); continue; } // incorrect extension detected diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp index a4d48d0557..e78975c392 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp @@ -517,14 +517,14 @@ TEST(MemoryInfo, givenMemoryInfoWithMemoryPolicyEnabledWhenCallingCreateGemExtFo auto executionEnvironment = std::make_unique(); auto drm = std::make_unique(*executionEnvironment->rootDeviceEnvironments[0]); - constexpr int num_numa = 4; + constexpr static int numNuma = 4; // setup numa library in MemoryInfo WhiteBoxNumaLibrary::GetMemPolicyPtr memPolicyHandler = [](int *mode, unsigned long nodeMask[], unsigned long, void *, unsigned long) -> long { if (mode) { *mode = 0; } - for (int i = 0; i < num_numa; i++) { + for (int i = 0; i < numNuma; i++) { nodeMask[i] = i; } return 0; @@ -532,7 +532,7 @@ TEST(MemoryInfo, givenMemoryInfoWithMemoryPolicyEnabledWhenCallingCreateGemExtFo WhiteBoxNumaLibrary::NumaAvailablePtr numaAvailableHandler = [](void) -> int { return 0; }; WhiteBoxNumaLibrary::NumaMaxNodePtr numaMaxNodeHandler = - [](void) -> int { return num_numa - 1; }; + [](void) -> int { return numNuma - 1; }; MockOsLibrary::loadLibraryNewObject = new MockOsLibraryCustom(nullptr, true); MockOsLibraryCustom *osLibrary = static_cast(MockOsLibrary::loadLibraryNewObject); // register proc pointers @@ -578,14 +578,14 @@ TEST(MemoryInfo, givenMemoryInfoWithMemoryPolicyEnabledAndOverrideMemoryPolicyMo auto executionEnvironment = std::make_unique(); auto drm = std::make_unique(*executionEnvironment->rootDeviceEnvironments[0]); - constexpr int num_numa = 4; + constexpr static int numNuma = 4; // setup numa library in MemoryInfo WhiteBoxNumaLibrary::GetMemPolicyPtr memPolicyHandler = [](int *mode, unsigned long nodeMask[], unsigned long, void *, unsigned long) -> long { if (mode) { *mode = 3; } - for (int i = 0; i < num_numa; i++) { + for (int i = 0; i < numNuma; i++) { nodeMask[i] = i; } return 0; @@ -593,7 +593,7 @@ TEST(MemoryInfo, givenMemoryInfoWithMemoryPolicyEnabledAndOverrideMemoryPolicyMo WhiteBoxNumaLibrary::NumaAvailablePtr numaAvailableHandler = [](void) -> int { return 0; }; WhiteBoxNumaLibrary::NumaMaxNodePtr numaMaxNodeHandler = - [](void) -> int { return num_numa - 1; }; + [](void) -> int { return numNuma - 1; }; MockOsLibrary::loadLibraryNewObject = new MockOsLibraryCustom(nullptr, true); MockOsLibraryCustom *osLibrary = static_cast(MockOsLibrary::loadLibraryNewObject); // register proc pointers