From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 13 Nov 2018 11:58:47 +0000 (+0000)
Subject: libx86: Fix 32bit stubdom build of x86_cpuid_policy_fill_native()
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~2972
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1bd2b750537b656f3fa90857707be91f5ed8bfd8;p=xen.git

libx86: Fix 32bit stubdom build of x86_cpuid_policy_fill_native()

With -m32, GCC generates a warning for &size_t == &unsigned long, which is the
typecheck hidden inside the min() macro.

Switch to using explicitly typed versions instead.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/xen/lib/x86/cpuid.c b/xen/lib/x86/cpuid.c
index f09d8d57c1..5a3159b357 100644
--- a/xen/lib/x86/cpuid.c
+++ b/xen/lib/x86/cpuid.c
@@ -7,8 +7,8 @@ void x86_cpuid_policy_fill_native(struct cpuid_policy *p)
     unsigned int i;
 
     cpuid_leaf(0, &p->basic.raw[0]);
-    for ( i = 1; i < min(ARRAY_SIZE(p->basic.raw),
-                         p->basic.max_leaf + 1ul); ++i )
+    for ( i = 1; i < min_t(unsigned int, ARRAY_SIZE(p->basic.raw),
+                           p->basic.max_leaf); ++i )
     {
         switch ( i )
         {
@@ -52,8 +52,8 @@ void x86_cpuid_policy_fill_native(struct cpuid_policy *p)
     {
         cpuid_count_leaf(7, 0, &p->feat.raw[0]);
 
-        for ( i = 1; i < min(ARRAY_SIZE(p->feat.raw),
-                             p->feat.max_subleaf + 1ul); ++i )
+        for ( i = 1; i < min_t(unsigned int, ARRAY_SIZE(p->feat.raw),
+                               p->feat.max_subleaf); ++i )
             cpuid_count_leaf(7, i, &p->feat.raw[i]);
     }
 
@@ -96,7 +96,8 @@ void x86_cpuid_policy_fill_native(struct cpuid_policy *p)
         xstates  = ((uint64_t)(p->xstate.xcr0_high | p->xstate.xss_high) << 32);
         xstates |=            (p->xstate.xcr0_low  | p->xstate.xss_low);
 
-        for ( i = 2; i < min(63ul, ARRAY_SIZE(p->xstate.raw)); ++i )
+        for ( i = 2; i < min_t(unsigned int, 63,
+                               ARRAY_SIZE(p->xstate.raw)); ++i )
         {
             if ( xstates & (1ul << i) )
                 cpuid_count_leaf(0xd, i, &p->xstate.raw[i]);
@@ -105,8 +106,8 @@ void x86_cpuid_policy_fill_native(struct cpuid_policy *p)
 
     /* Extended leaves. */
     cpuid_leaf(0x80000000, &p->extd.raw[0]);
-    for ( i = 1; i < min(ARRAY_SIZE(p->extd.raw),
-                         p->extd.max_leaf + 1 - 0x80000000ul); ++i )
+    for ( i = 1; i < min_t(unsigned int, ARRAY_SIZE(p->extd.raw),
+                           p->extd.max_leaf + 1 - 0x80000000); ++i )
         cpuid_leaf(0x80000000 + i, &p->extd.raw[i]);
 }