From: Wei Liu <wei.liu2@citrix.com>
Date: Mon, 24 Oct 2016 10:11:15 +0000 (+0100)
Subject: libxl: initialise nr_dom_vcpus to fix 4a6070ea9
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~156
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a134aeaa17ad3618575fac86f27246a3b2466001;p=xen.git

libxl: initialise nr_dom_vcpus to fix 4a6070ea9

Clang complains nr_dom_vcpus may be used uninitialised after
4a6070ea9.

The real issue is vinfo can be NULL and nr_dom_vcpus remains
uninitialised if previous call fails.

Initialise nr_dom_vcpus to 0 at the beginning of the loop to fix the
issue.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Dario Faggioli <dario.faggioli@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/libxl/libxl_numa.c b/tools/libxl/libxl_numa.c
index fd64c22686..a8a75f89e9 100644
--- a/tools/libxl/libxl_numa.c
+++ b/tools/libxl/libxl_numa.c
@@ -206,8 +206,9 @@ static int nr_vcpus_on_nodes(libxl__gc *gc, libxl_cputopology *tinfo,
 
     for (i = 0; i < nr_doms; i++) {
         libxl_vcpuinfo *vinfo = NULL;
+        int nr_dom_vcpus = 0;
         libxl_cpupoolinfo cpupool_info;
-        int cpupool, nr_dom_vcpus;
+        int cpupool;
 
         libxl_cpupoolinfo_init(&cpupool_info);