From: Jim Fehlig <jfehlig@suse.com>
Date: Thu, 19 Jun 2014 05:47:41 +0000 (-0600)
Subject: Fix xmconfigtest
X-Git-Tag: v1.2.6-rc1~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64b60266adffc73c09f5316bffdfac29b2fc991b;p=thirdparty%2Flibvirt.git

Fix xmconfigtest

Commit ac63014c introduced a regression in the conversion of Xen
xm config to XML by emitting an empty <cmdline>.  Prior to this
commit, <cmdline> was omitted if the xm config was missing (or
contained an empty) 'extra='.
---

diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index 745041b327..2cd6d4c901 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -350,7 +350,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
             goto cleanup;
         if (xenXMConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < 0)
             goto cleanup;
-        if (xenXMConfigGetString(conf, "extra", &extra, "") < 0)
+        if (xenXMConfigGetString(conf, "extra", &extra, NULL) < 0)
             goto cleanup;
         if (xenXMConfigGetString(conf, "root", &root, NULL) < 0)
             goto cleanup;