Commit a11128ce authored by Ethan Zhao's avatar Ethan Zhao Committed by Sean Christopherson
Browse files

KVM: x86/cpuid: add type suffix to decimal const 48 fix building warning 



The default type of a decimal constant is determined by the magnitude of
its value. If the value falls within the range of int, its type is int;
otherwise, if it falls within the range of unsigned int, its type is
unsigned int. This results in the constant 48 being of type int. In the
following min call,

g_phys_as = min(g_phys_as, 48);

This leads to a building warning/error (CONFIG_KVM_WERROR=y) caused by
the mismatch between the types of the two arguments to macro min. By
adding the suffix U to explicitly declare the type of the constant, this
issue is fixed.

Signed-off-by: default avatarEthan Zhao <haifeng.zhao@linux.intel.com>
Link: https://lore.kernel.org/r/20250127013837.12983-1-haifeng.zhao@linux.intel.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent e9cb6105

arch/x86/kvm/cpuid.c

+1 −1
Original line number Diff line number Diff line
@@ -1704,7 +1704,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) 
			phys_as = entry->eax & 0xff;

			g_phys_as = phys_as;

			if (kvm_mmu_get_max_tdp_level() < 5)

				g_phys_as = min(g_phys_as, 48);

				g_phys_as = min(g_phys_as, 48U);

		}



		entry->eax = phys_as | (virt_as << 8) | (g_phys_as << 16);