diff options
| author | Matthew Daley <mattjd@gmail.com> | 2013-09-29 18:47:37 +1300 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-10-03 14:45:54 +0100 |
| commit | 1e143e2ae8be3ba86c2e931a1ee8d91efca08f89 (patch) | |
| tree | 9b8521c918eb0bfe5af35d184d68edd80e71d81a | |
| parent | 14cd36c23d7165156e1ec4ecb082363dfffe7537 (diff) | |
| download | xen-1e143e2ae8be3ba86c2e931a1ee8d91efca08f89.tar.gz xen-1e143e2ae8be3ba86c2e931a1ee8d91efca08f89.tar.bz2 xen-1e143e2ae8be3ba86c2e931a1ee8d91efca08f89.zip | |
libxl: correctly handle libxl_get_cpu_topology failure in libxl_{cpu, node}map_to_{node, cpu}map
Initialize nr_cpus to 0 so that if it is unchanged by a failing
libxl_get_cpu_topology, libxl_cputopology_list_free still works OK
afterward.
Coverity-ID: 1055294
Coverity-ID: 1055295
Signed-off-by: Matthew Daley <mattjd@gmail.com>
Acked-by: Dario Faggioli <dario.faggioli@citrix.com>
| -rw-r--r-- | tools/libxl/libxl_utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 4309e5e345..244725bd7f 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -650,7 +650,7 @@ int libxl_nodemap_to_cpumap(libxl_ctx *ctx, libxl_bitmap *cpumap) { libxl_cputopology *tinfo = NULL; - int nr_cpus, i, rc = 0; + int nr_cpus = 0, i, rc = 0; tinfo = libxl_get_cpu_topology(ctx, &nr_cpus); if (tinfo == NULL) { @@ -673,7 +673,7 @@ int libxl_cpumap_to_nodemap(libxl_ctx *ctx, libxl_bitmap *nodemap) { libxl_cputopology *tinfo = NULL; - int nr_cpus, i, rc = 0; + int nr_cpus = 0, i, rc = 0; tinfo = libxl_get_cpu_topology(ctx, &nr_cpus); if (tinfo == NULL) { |