x86/cpuid: Fix build with CentOS 6 following c/s 7479151106
diff mbox series

Message ID 20190909155534.20514-1-andrew.cooper3@citrix.com
State New
Headers show
Series
  • x86/cpuid: Fix build with CentOS 6 following c/s 7479151106
Related show

Commit Message

Andrew Cooper Sept. 9, 2019, 3:55 p.m. UTC
GCC of a CentOS 6 vintage complains:

  cpuid.c: In function 'parse_xen_cpuid':
  cpuid.c:32: error: 'mid' may be used uninitialized in this function

This can't occur in practice because the while() loop is guarenteed to be
entered, but initialise mid to work around the issues.

Spotted by Gitlab CI.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Wei Liu <wl@xen.org>
CC: Roger Pau Monné <roger.pau@citrix.com>
---
 xen/arch/x86/cpuid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jan Beulich Sept. 10, 2019, 6:38 a.m. UTC | #1
On 09.09.2019 17:55, Andrew Cooper wrote:
> GCC of a CentOS 6 vintage complains:
> 
>   cpuid.c: In function 'parse_xen_cpuid':
>   cpuid.c:32: error: 'mid' may be used uninitialized in this function
> 
> This can't occur in practice because the while() loop is guarenteed to be
> entered, but initialise mid to work around the issues.
> 
> Spotted by Gitlab CI.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Ah, yes, thanks. I too had noticed this yesterday, but didn't get
around to check what the correct workaround would be.

Acked-by: Jan Beulich <jbeulich@suse.com>

Jan

Patch
diff mbox series

diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c
index 36b1e2ce4c..acba0f7583 100644
--- a/xen/arch/x86/cpuid.c
+++ b/xen/arch/x86/cpuid.c
@@ -29,7 +29,7 @@  static int __init parse_xen_cpuid(const char *s)
             const char *name;
             unsigned int bit;
         } features[] __initconstrel = INIT_FEATURE_NAMES;
-        const struct feature *lhs, *mid, *rhs;
+        const struct feature *lhs, *rhs, *mid = NULL /* GCC... */;
         const char *feat;
 
         ss = strchr(s, ',');