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='.
Signed-off-by: Jim Fehlig <jfehlig(a)suse.com>
---
Pushing under the build breaker rule.
src/xenxs/xen_xm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index 745041b..2cd6d4c 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;
--
1.8.4.5
Show replies by date