From: Daniel P. Berrange Date: Tue, 18 Nov 2014 15:37:00 +0000 (+0000) Subject: Don't use VIR_DOMAIN_XML_SECURE when parsing XML X-Git-Tag: v1.2.12-rc1~62 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d6ed1bf0b4e5905c051737db14f7c49288e5f3a;p=thirdparty%2Flibvirt.git Don't use VIR_DOMAIN_XML_SECURE when parsing XML The VIR_DOMAIN_XML_SECURE flag only has effect on the formatting of XML so should not be passed to virDomainDefParseNode --- diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 79cf1245b4..d9339c363e 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -287,8 +287,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, def->dom = virDomainDefParseNode(ctxt->node->doc, domainNode, caps, xmlopt, expectedVirtTypes, - (VIR_DOMAIN_XML_INACTIVE | - VIR_DOMAIN_XML_SECURE)); + VIR_DOMAIN_XML_INACTIVE); if (!def->dom) goto cleanup; } else { diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 269d0303c9..71db7bdbc7 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3558,7 +3558,7 @@ phypDomainCreateXML(virConnectPtr conn, if (!(def = virDomainDefParseString(xml, phyp_driver->caps, phyp_driver->xmlopt, 1 << VIR_DOMAIN_VIRT_PHYP, - VIR_DOMAIN_XML_SECURE))) + 0))) goto err; /* checking if this name already exists on this system */