From: Wei Liu <wei.liu2@citrix.com>
Date: Fri, 11 Sep 2015 13:50:09 +0000 (+0100)
Subject: xl: handle empty vnuma configuration
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2543
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ebe3fd9e736dda6cb141abe1241f0c8491125ebc;p=xen.git

xl: handle empty vnuma configuration

When user specifies vnuma = [], we need to skip the whole parser
function, otherwise the parser sets b_info->max_memkb to garbage value.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index c9bd8397d0..bfbd42128d 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -1093,6 +1093,9 @@ static void parse_vnuma_config(const XLU_Config *config,
     if (xlu_cfg_get_list(config, "vnuma", &vnuma, &num_vnuma, 1))
         return;
 
+    if (!num_vnuma)
+        return;
+
     b_info->num_vnuma_nodes = num_vnuma;
     b_info->vnuma_nodes = xcalloc(num_vnuma, sizeof(libxl_vnode_info));
     vcpu_parsed = xcalloc(num_vnuma, sizeof(libxl_bitmap));