From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 18 Jun 2014 12:13:26 +0000 (+0200)
Subject: vbox_snapshot_conf: fix wrong use of 'xmlSaveFormatFileEnc'
X-Git-Tag: v1.2.6-rc1~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97af511b1a1cd49a7a5ffcdc3975a72239a7afdc;p=thirdparty%2Flibvirt.git

vbox_snapshot_conf: fix wrong use of 'xmlSaveFormatFileEnc'

The function 'xmlSaveFormatFileEnc' has a last option to set
if you want to format dumped xml with whitespaces or not.

Older libxml2, the one used in RHEL6, take this option as it is
but newer libxml2 check this option if it's true or not. This
small difference somehow makes things messy on RHEL6 and generated
xml had extra new line and extra whitespaces.

We should pass 1 instead if -1 because the -1 confuses the libxml2.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c
index 3f7ad78e0e..7af1231a91 100644
--- a/src/vbox/vbox_snapshot_conf.c
+++ b/src/vbox/vbox_snapshot_conf.c
@@ -1211,7 +1211,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMachinePtr machine,
         }
     }
 
-    if (xmlSaveFormatFileEnc(filePath, xml, "ISO-8859-1", -1) < 0) {
+    if (xmlSaveFormatFileEnc(filePath, xml, "ISO-8859-1", 1) < 0) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("Unable to save the xml"));
         goto cleanup;