If the cfg file includes root= but not extra= (nor cmdline=, which
supercedes both) then the command line will end up with an extra
"(null)" on it (at least with glibc's implementation of asprintf).
Signed-off-by: Ian Campbell <ian.campb...@citrix.com>
Cc: Chunyan Liu <cy...@suse.com>
---
tools/libxl/xl_cmdimpl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 96fbe63..2c32a96 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -817,9 +817,11 @@ static char *parse_cmdline(XLU_Config *config)
fprintf(stderr, "Warning: ignoring root= and extra= "
"in favour of cmdline=\n");
} else {
- if (root) {
+ if (root && extra) {
if (asprintf(&cmdline, "root=%s %s", root, extra) == -1)
cmdline = NULL;
+ } else if (root) {
+ cmdline = strdup(root);
} else if (extra) {
cmdline = strdup(extra);
}
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
