openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

xenconfig: xm: Fix checking for extra in parser 

Parser assumed extra was always present when root was specified.
Fixed by handling root and extra separately.

Signed-off-by: Filip Alac <filipalac@gmail.com>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Filip Alac 2018-05-12 17:45:02 +02:00 committed by Jim Fehlig
parent e387a1d796
commit 656151bf5d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenconfig/xen_xm.c
View File

@ -91,10 +91,13 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def)
if (xenConfigGetString(conf, "root", &root, NULL) < 0) if (xenConfigGetString(conf, "root", &root, NULL) < 0)
return -1; return -1;
if (root) { if (root && extra) {
if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0) if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0)
return -1; return -1;
} else { } else if (root) {
if (virAsprintf(&def->os.cmdline, "root=%s", root) < 0)
return -1;
} else if (extra) {
if (VIR_STRDUP(def->os.cmdline, extra) < 0) if (VIR_STRDUP(def->os.cmdline, extra) < 0)
return -1; return -1;
} }