[PATCH] xenconfig: xm: Fix checking for extra in parser

[Filip Alac <filipalac@xxxxxxxxx>]

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

---
 src/xenconfig/xen_xm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c
index 8ef68bbc..4becb40b 100644
--- a/src/xenconfig/xen_xm.c
+++ b/src/xenconfig/xen_xm.c
@@ -91,10 +91,13 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def)
         if (xenConfigGetString(conf, "root", &root, NULL) < 0)
             return -1;
 
-        if (root) {
+        if (root && extra) {
             if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0)
                 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)
                 return -1;
         }
-- 
2.17.0

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list