NuKVM/libvirt
3
0 Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2026-10-02 12:20:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

xenconfig: xm: Fix checking for extra in parser

Browse Source 
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 authored and Jim Fehlig committed 2018-05-14 17:07:30 -06:00
1 parent e387a1d796
commit 656151bf5d
1 file changed
+5 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/xenconfig/xen_xm.c
+5 -2
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;
} }