External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 09:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

virDomainDefParse{File,String}: Introduce @parseOpaque argument

Browse Source 
We want to pass the proper opaque pointer instead of NULL to
virDomainDefParse and subsequently virDomainDefParseNode too.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2016-09-22 17:14:17 +02:00
parent da6c604af2
commit c41b989112
33 changed files with 67 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bhyve/bhyve_driver.c
View File

@ -538,7 +538,7 @@ bhyveDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flag
return NULL; return NULL;
if ((def = virDomainDefParseString(xml, caps, privconn->xmlopt, if ((def = virDomainDefParseString(xml, caps, privconn->xmlopt,
parse_flags)) == NULL) NULL, parse_flags)) == NULL)
goto cleanup; goto cleanup;
if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0) if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0)
@ -725,7 +725,7 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn,
goto cleanup; goto cleanup;
if (!(def = virDomainDefParseString(xmlData, caps, privconn->xmlopt, if (!(def = virDomainDefParseString(xmlData, caps, privconn->xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE))) NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto cleanup; goto cleanup;
if (bhyveDomainAssignAddresses(def, NULL) < 0) if (bhyveDomainAssignAddresses(def, NULL) < 0)
@ -938,7 +938,7 @@ bhyveDomainCreateXML(virConnectPtr conn,
return NULL; return NULL;
if ((def = virDomainDefParseString(xml, caps, privconn->xmlopt, if ((def = virDomainDefParseString(xml, caps, privconn->xmlopt,
parse_flags)) == NULL) NULL, parse_flags)) == NULL)
goto cleanup; goto cleanup;
if (virDomainCreateXMLEnsureACL(conn, def) < 0) if (virDomainCreateXMLEnsureACL(conn, def) < 0)

11
src/conf/domain_conf.c
View File

@ -17751,6 +17751,7 @@ virDomainDefParse(const char *xmlStr,
const char *filename, const char *filename,
virCapsPtr caps, virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque,
unsigned int flags) unsigned int flags)
{ {
xmlDocPtr xml; xmlDocPtr xml;
@ -17759,7 +17760,7 @@ virDomainDefParse(const char *xmlStr,
if ((xml = virXMLParse(filename, xmlStr, _("(domain_definition)")))) { if ((xml = virXMLParse(filename, xmlStr, _("(domain_definition)")))) {
def = virDomainDefParseNode(xml, xmlDocGetRootElement(xml), caps, def = virDomainDefParseNode(xml, xmlDocGetRootElement(xml), caps,
xmlopt, NULL, flags); xmlopt, parseOpaque, flags);
xmlFreeDoc(xml); xmlFreeDoc(xml);
} }
@ -17771,18 +17772,20 @@ virDomainDefPtr
virDomainDefParseString(const char *xmlStr, virDomainDefParseString(const char *xmlStr,
virCapsPtr caps, virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque,
unsigned int flags) unsigned int flags)
{ {
return virDomainDefParse(xmlStr, NULL, caps, xmlopt, flags); return virDomainDefParse(xmlStr, NULL, caps, xmlopt, parseOpaque, flags);
} }
virDomainDefPtr virDomainDefPtr
virDomainDefParseFile(const char *filename, virDomainDefParseFile(const char *filename,
virCapsPtr caps, virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque,
unsigned int flags) unsigned int flags)
{ {
return virDomainDefParse(NULL, filename, caps, xmlopt, flags); return virDomainDefParse(NULL, filename, caps, xmlopt, parseOpaque, flags);
} }
@ -24673,7 +24676,7 @@ virDomainDefCopy(virDomainDefPtr src,
if (!(xml = virDomainDefFormat(src, caps, format_flags))) if (!(xml = virDomainDefFormat(src, caps, format_flags)))
return NULL; return NULL;
ret = virDomainDefParseString(xml, caps, xmlopt, parse_flags); ret = virDomainDefParseString(xml, caps, xmlopt, NULL, parse_flags);
VIR_FREE(xml); VIR_FREE(xml);
return ret; return ret;

2
src/conf/domain_conf.h
View File

@ -2675,10 +2675,12 @@ virStorageSourcePtr virDomainDiskDefSourceParse(const char *xmlStr,
virDomainDefPtr virDomainDefParseString(const char *xmlStr, virDomainDefPtr virDomainDefParseString(const char *xmlStr,
virCapsPtr caps, virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque,
unsigned int flags); unsigned int flags);
virDomainDefPtr virDomainDefParseFile(const char *filename, virDomainDefPtr virDomainDefParseFile(const char *filename,
virCapsPtr caps, virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque,
unsigned int flags); unsigned int flags);
virDomainDefPtr virDomainDefParseNode(xmlDocPtr doc, virDomainDefPtr virDomainDefParseNode(xmlDocPtr doc,
xmlNodePtr root, xmlNodePtr root,

2
src/conf/virdomainobjlist.c
View File

@ -462,7 +462,7 @@ virDomainObjListLoadConfig(virDomainObjListPtr doms,
if ((configFile = virDomainConfigFile(configDir, name)) == NULL) if ((configFile = virDomainConfigFile(configDir, name)) == NULL)
goto error; goto error;
if (!(def = virDomainDefParseFile(configFile, caps, xmlopt, if (!(def = virDomainDefParseFile(configFile, caps, xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS | VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))

4
src/esx/esx_driver.c
View File

@ -2831,7 +2831,7 @@ esxConnectDomainXMLToNative(virConnectPtr conn, const char *nativeFormat,
return NULL; return NULL;
def = virDomainDefParseString(domainXml, priv->caps, priv->xmlopt, def = virDomainDefParseString(domainXml, priv->caps, priv->xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE); NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE);
if (!def) if (!def)
return NULL; return NULL;
@ -3046,7 +3046,7 @@ esxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags)
/* Parse domain XML */ /* Parse domain XML */
def = virDomainDefParseString(xml, priv->caps, priv->xmlopt, def = virDomainDefParseString(xml, priv->caps, priv->xmlopt,
parse_flags); NULL, parse_flags);
if (!def) if (!def)
return NULL; return NULL;

2
src/libxl/libxl_domain.c
View File

@ -677,7 +677,7 @@ libxlDomainSaveImageOpen(libxlDriverPrivatePtr driver,
goto error; goto error;
} }
if (!(def = virDomainDefParseString(xml, cfg->caps, driver->xmlopt, if (!(def = virDomainDefParseString(xml, cfg->caps, driver->xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
goto error; goto error;

6
src/libxl/libxl_driver.c
View File

@ -1027,7 +1027,7 @@ libxlDomainCreateXML(virConnectPtr conn, const char *xml,
parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA;
if (!(def = virDomainDefParseString(xml, cfg->caps, driver->xmlopt, if (!(def = virDomainDefParseString(xml, cfg->caps, driver->xmlopt,
parse_flags))) NULL, parse_flags)))
goto cleanup; goto cleanup;
if (virDomainCreateXMLEnsureACL(conn, def) < 0) if (virDomainCreateXMLEnsureACL(conn, def) < 0)
@ -2655,7 +2655,7 @@ libxlConnectDomainXMLToNative(virConnectPtr conn, const char * nativeFormat,
goto cleanup; goto cleanup;
if (!(def = virDomainDefParseString(domainXml, if (!(def = virDomainDefParseString(domainXml,
cfg->caps, driver->xmlopt, cfg->caps, driver->xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE))) VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto cleanup; goto cleanup;
@ -2781,7 +2781,7 @@ libxlDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flag
parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA;
if (!(def = virDomainDefParseString(xml, cfg->caps, driver->xmlopt, if (!(def = virDomainDefParseString(xml, cfg->caps, driver->xmlopt,
parse_flags))) NULL, parse_flags)))
goto cleanup; goto cleanup;
if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0) if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0)

3
src/libxl/libxl_migration.c
View File

@ -419,6 +419,7 @@ libxlDomainMigrationBegin(virConnectPtr conn,
if (xmlin) { if (xmlin) {
if (!(tmpdef = virDomainDefParseString(xmlin, cfg->caps, if (!(tmpdef = virDomainDefParseString(xmlin, cfg->caps,
driver->xmlopt, driver->xmlopt,
NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
goto endjob; goto endjob;
@ -463,6 +464,7 @@ libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver,
} }
if (!(def = virDomainDefParseString(dom_xml, cfg->caps, driver->xmlopt, if (!(def = virDomainDefParseString(dom_xml, cfg->caps, driver->xmlopt,
NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
goto cleanup; goto cleanup;
@ -544,6 +546,7 @@ libxlDomainMigrationPrepare(virConnectPtr dconn,
VIR_DEBUG("Using hook-filtered domain XML: %s", xmlout); VIR_DEBUG("Using hook-filtered domain XML: %s", xmlout);
newdef = virDomainDefParseString(xmlout, cfg->caps, driver->xmlopt, newdef = virDomainDefParseString(xmlout, cfg->caps, driver->xmlopt,
NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE);
if (!newdef) if (!newdef)

4
src/lxc/lxc_driver.c
View File

@ -472,7 +472,7 @@ lxcDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags)
goto cleanup; goto cleanup;
if (!(def = virDomainDefParseString(xml, caps, driver->xmlopt, if (!(def = virDomainDefParseString(xml, caps, driver->xmlopt,
parse_flags))) NULL, parse_flags)))
goto cleanup; goto cleanup;
if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0) if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0)
@ -1225,7 +1225,7 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn,
goto cleanup; goto cleanup;
if (!(def = virDomainDefParseString(xml, caps, driver->xmlopt, if (!(def = virDomainDefParseString(xml, caps, driver->xmlopt,
parse_flags))) NULL, parse_flags)))
goto cleanup; goto cleanup;
if (virDomainCreateXMLWithFilesEnsureACL(conn, def) < 0) if (virDomainCreateXMLWithFilesEnsureACL(conn, def) < 0)

5
src/openvz/openvz_driver.c
View File

@ -996,7 +996,7 @@ openvzDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int fla
openvzDriverLock(driver); openvzDriverLock(driver);
if ((vmdef = virDomainDefParseString(xml, driver->caps, driver->xmlopt, if ((vmdef = virDomainDefParseString(xml, driver->caps, driver->xmlopt,
parse_flags)) == NULL) NULL, parse_flags)) == NULL)
goto cleanup; goto cleanup;
if (!(vm = virDomainObjListAdd(driver->domains, vmdef, if (!(vm = virDomainObjListAdd(driver->domains, vmdef,
@ -1086,7 +1086,7 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml,
openvzDriverLock(driver); openvzDriverLock(driver);
if ((vmdef = virDomainDefParseString(xml, driver->caps, driver->xmlopt, if ((vmdef = virDomainDefParseString(xml, driver->caps, driver->xmlopt,
parse_flags)) == NULL) NULL, parse_flags)) == NULL)
goto cleanup; goto cleanup;
if (!(vm = virDomainObjListAdd(driver->domains, if (!(vm = virDomainObjListAdd(driver->domains,
@ -2317,6 +2317,7 @@ openvzDomainMigratePrepare3Params(virConnectPtr dconn,
} }
if (!(def = virDomainDefParseString(dom_xml, driver->caps, driver->xmlopt, if (!(def = virDomainDefParseString(dom_xml, driver->caps, driver->xmlopt,
NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
goto error; goto error;

1
src/phyp/phyp_driver.c
View File

@ -3576,6 +3576,7 @@ phypDomainCreateXML(virConnectPtr conn,
if (!(def = virDomainDefParseString(xml, phyp_driver->caps, if (!(def = virDomainDefParseString(xml, phyp_driver->caps,
phyp_driver->xmlopt, phyp_driver->xmlopt,
NULL,
parse_flags))) parse_flags)))
goto err; goto err;

2
src/qemu/qemu_domain.c
View File

@ -3364,7 +3364,7 @@ qemuDomainDefCopy(virQEMUDriverPtr driver,
if (!(caps = virQEMUDriverGetCapabilities(driver, false))) if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto cleanup; goto cleanup;
if (!(ret = virDomainDefParseString(xml, caps, driver->xmlopt, if (!(ret = virDomainDefParseString(xml, caps, driver->xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
goto cleanup; goto cleanup;

14
src/qemu/qemu_driver.c
View File

@ -1751,7 +1751,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn,
goto cleanup; goto cleanup;
if (!(def = virDomainDefParseString(xml, caps, driver->xmlopt, if (!(def = virDomainDefParseString(xml, caps, driver->xmlopt,
parse_flags))) NULL, parse_flags)))
goto cleanup; goto cleanup;
if (virDomainCreateXMLEnsureACL(conn, def) < 0) if (virDomainCreateXMLEnsureACL(conn, def) < 0)
@ -3185,7 +3185,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom,
if (xmlin) { if (xmlin) {
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
if (!(def = virDomainDefParseString(xmlin, caps, driver->xmlopt, if (!(def = virDomainDefParseString(xmlin, caps, driver->xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) { VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) {
goto endjob; goto endjob;
@ -6306,7 +6306,7 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver,
if (!(caps = virQEMUDriverGetCapabilities(driver, false))) if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto cleanup; goto cleanup;
if (!(newdef = virDomainDefParseString(newxml, caps, driver->xmlopt, if (!(newdef = virDomainDefParseString(newxml, caps, driver->xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE))) VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto cleanup; goto cleanup;
@ -6462,7 +6462,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver,
} }
/* Create a domain from this XML */ /* Create a domain from this XML */
if (!(def = virDomainDefParseString(xml, caps, driver->xmlopt, if (!(def = virDomainDefParseString(xml, caps, driver->xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
goto error; goto error;
@ -7014,7 +7014,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
if (!(vm = virDomainObjNew(driver->xmlopt))) if (!(vm = virDomainObjNew(driver->xmlopt)))
goto cleanup; goto cleanup;
if (!(vm->def = virDomainDefParseString(xmlData, caps, driver->xmlopt, if (!(vm->def = virDomainDefParseString(xmlData, caps, driver->xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_ABI_UPDATE))) VIR_DOMAIN_DEF_PARSE_ABI_UPDATE)))
goto cleanup; goto cleanup;
@ -7252,7 +7252,7 @@ qemuDomainDefineXMLFlags(virConnectPtr conn,
goto cleanup; goto cleanup;
if (!(def = virDomainDefParseString(xml, caps, driver->xmlopt, if (!(def = virDomainDefParseString(xml, caps, driver->xmlopt,
parse_flags))) NULL, parse_flags)))
goto cleanup; goto cleanup;
if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0) if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0)
@ -14596,7 +14596,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
/* Easiest way to clone inactive portion of vm->def is via /* Easiest way to clone inactive portion of vm->def is via
* conversion in and back out of xml. */ * conversion in and back out of xml. */
if (!(xml = qemuDomainDefFormatLive(driver, vm->def, true, true)) || if (!(xml = qemuDomainDefFormatLive(driver, vm->def, true, true)) ||
!(def->dom = virDomainDefParseString(xml, caps, driver->xmlopt, !(def->dom = virDomainDefParseString(xml, caps, driver->xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
goto endjob; goto endjob;

6
src/qemu/qemu_migration.c
View File

@ -3242,7 +3242,7 @@ qemuMigrationBeginPhase(virQEMUDriverPtr driver,
} }
if (xmlin) { if (xmlin) {
if (!(def = virDomainDefParseString(xmlin, caps, driver->xmlopt, if (!(def = virDomainDefParseString(xmlin, caps, driver->xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
goto cleanup; goto cleanup;
@ -3664,7 +3664,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
virDomainDefPtr newdef; virDomainDefPtr newdef;
VIR_DEBUG("Using hook-filtered domain XML: %s", xmlout); VIR_DEBUG("Using hook-filtered domain XML: %s", xmlout);
newdef = virDomainDefParseString(xmlout, caps, driver->xmlopt, newdef = virDomainDefParseString(xmlout, caps, driver->xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE);
if (!newdef) if (!newdef)
@ -4144,7 +4144,7 @@ qemuMigrationPrepareDef(virQEMUDriverPtr driver,
if (!(caps = virQEMUDriverGetCapabilities(driver, false))) if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
return NULL; return NULL;
if (!(def = virDomainDefParseString(dom_xml, caps, driver->xmlopt, if (!(def = virDomainDefParseString(dom_xml, caps, driver->xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
goto cleanup; goto cleanup;

2
src/security/virt-aa-helper.c
View File

@ -704,7 +704,7 @@ get_definition(vahControl * ctl, const char *xmlStr)
} }
ctl->def = virDomainDefParseString(xmlStr, ctl->def = virDomainDefParseString(xmlStr,
ctl->caps, ctl->xmlopt, ctl->caps, ctl->xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE);
if (ctl->def == NULL) { if (ctl->def == NULL) {

6
src/test/test_driver.c
View File

@ -1609,7 +1609,7 @@ testDomainCreateXML(virConnectPtr conn, const char *xml,
testDriverLock(privconn); testDriverLock(privconn);
if ((def = virDomainDefParseString(xml, privconn->caps, privconn->xmlopt, if ((def = virDomainDefParseString(xml, privconn->caps, privconn->xmlopt,
parse_flags)) == NULL) NULL, parse_flags)) == NULL)
goto cleanup; goto cleanup;
if (testDomainGenerateIfnames(def) < 0) if (testDomainGenerateIfnames(def) < 0)
@ -2118,7 +2118,7 @@ testDomainRestoreFlags(virConnectPtr conn,
xml[len] = '\0'; xml[len] = '\0';
def = virDomainDefParseString(xml, privconn->caps, privconn->xmlopt, def = virDomainDefParseString(xml, privconn->caps, privconn->xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE); NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE);
if (!def) if (!def)
goto cleanup; goto cleanup;
@ -2615,7 +2615,7 @@ static virDomainPtr testDomainDefineXMLFlags(virConnectPtr conn,
parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA;
if ((def = virDomainDefParseString(xml, privconn->caps, privconn->xmlopt, if ((def = virDomainDefParseString(xml, privconn->caps, privconn->xmlopt,
parse_flags)) == NULL) NULL, parse_flags)) == NULL)
goto cleanup; goto cleanup;
if (testDomainGenerateIfnames(def) < 0) if (testDomainGenerateIfnames(def) < 0)

4
src/uml/uml_driver.c
View File

@ -1589,7 +1589,7 @@ static virDomainPtr umlDomainCreateXML(virConnectPtr conn, const char *xml,
virNWFilterReadLockFilterUpdates(); virNWFilterReadLockFilterUpdates();
umlDriverLock(driver); umlDriverLock(driver);
if (!(def = virDomainDefParseString(xml, driver->caps, driver->xmlopt, if (!(def = virDomainDefParseString(xml, driver->caps, driver->xmlopt,
parse_flags))) NULL, parse_flags)))
goto cleanup; goto cleanup;
if (virDomainCreateXMLEnsureACL(conn, def) < 0) if (virDomainCreateXMLEnsureACL(conn, def) < 0)
@ -2070,7 +2070,7 @@ umlDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags)
umlDriverLock(driver); umlDriverLock(driver);
if (!(def = virDomainDefParseString(xml, driver->caps, driver->xmlopt, if (!(def = virDomainDefParseString(xml, driver->caps, driver->xmlopt,
parse_flags))) NULL, parse_flags)))
goto cleanup; goto cleanup;
if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0) if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0)

2
src/vbox/vbox_common.c
View File

@ -1874,7 +1874,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags
VBOX_IID_INITIALIZE(&mchiid); VBOX_IID_INITIALIZE(&mchiid);
if (!(def = virDomainDefParseString(xml, data->caps, data->xmlopt, if (!(def = virDomainDefParseString(xml, data->caps, data->xmlopt,
parse_flags))) { NULL, parse_flags))) {
goto cleanup; goto cleanup;
} }

4
src/vmware/vmware_driver.c
View File

@ -388,7 +388,7 @@ vmwareDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int fla
vmwareDriverLock(driver); vmwareDriverLock(driver);
if ((vmdef = virDomainDefParseString(xml, driver->caps, driver->xmlopt, if ((vmdef = virDomainDefParseString(xml, driver->caps, driver->xmlopt,
parse_flags)) == NULL) NULL, parse_flags)) == NULL)
goto cleanup; goto cleanup;
/* generate vmx file */ /* generate vmx file */
@ -682,7 +682,7 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *xml,
vmwareDriverLock(driver); vmwareDriverLock(driver);
if ((vmdef = virDomainDefParseString(xml, driver->caps, driver->xmlopt, if ((vmdef = virDomainDefParseString(xml, driver->caps, driver->xmlopt,
parse_flags)) == NULL) NULL, parse_flags)) == NULL)
goto cleanup; goto cleanup;
/* generate vmx file */ /* generate vmx file */

3
src/vz/vz_driver.c
View File

@ -850,7 +850,7 @@ vzDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags)
parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA;
if ((def = virDomainDefParseString(xml, driver->caps, driver->xmlopt, if ((def = virDomainDefParseString(xml, driver->caps, driver->xmlopt,
parse_flags)) == NULL) NULL, parse_flags)) == NULL)
goto cleanup; goto cleanup;
if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0) if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0)
@ -3046,6 +3046,7 @@ vzDomainMigratePrepare3Params(virConnectPtr conn,
goto cleanup; goto cleanup;
if (!(def = virDomainDefParseString(dom_xml, driver->caps, driver->xmlopt, if (!(def = virDomainDefParseString(dom_xml, driver->caps, driver->xmlopt,
NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE))) VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto cleanup; goto cleanup;

5
src/xen/xen_driver.c
View File

@ -765,7 +765,7 @@ xenUnifiedDomainCreateXML(virConnectPtr conn,
parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA;
if (!(def = virDomainDefParseString(xml, priv->caps, priv->xmlopt, if (!(def = virDomainDefParseString(xml, priv->caps, priv->xmlopt,
parse_flags))) NULL, parse_flags)))
goto cleanup; goto cleanup;
if (virDomainCreateXMLEnsureACL(conn, def) < 0) if (virDomainCreateXMLEnsureACL(conn, def) < 0)
@ -1617,6 +1617,7 @@ xenUnifiedConnectDomainXMLToNative(virConnectPtr conn,
} }
if (!(def = virDomainDefParseString(xmlData, priv->caps, priv->xmlopt, if (!(def = virDomainDefParseString(xmlData, priv->caps, priv->xmlopt,
NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE))) VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto cleanup; goto cleanup;
@ -1805,7 +1806,7 @@ xenUnifiedDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int
parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA;
if (!(def = virDomainDefParseString(xml, priv->caps, priv->xmlopt, if (!(def = virDomainDefParseString(xml, priv->caps, priv->xmlopt,
parse_flags))) NULL, parse_flags)))
goto cleanup; goto cleanup;
if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0) if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0)

2
src/xenapi/xenapi_driver.c
View File

@ -568,6 +568,7 @@ xenapiDomainCreateXML(virConnectPtr conn,
virDomainDefPtr defPtr = virDomainDefParseString(xmlDesc, virDomainDefPtr defPtr = virDomainDefParseString(xmlDesc,
priv->caps, priv->xmlopt, priv->caps, priv->xmlopt,
NULL,
parse_flags); parse_flags);
if (!defPtr) if (!defPtr)
return NULL; return NULL;
@ -1752,6 +1753,7 @@ xenapiDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int fla
return NULL; return NULL;
virDomainDefPtr defPtr = virDomainDefParseString(xml, virDomainDefPtr defPtr = virDomainDefParseString(xml,
priv->caps, priv->xmlopt, priv->caps, priv->xmlopt,
NULL,
parse_flags); parse_flags);
if (!defPtr) if (!defPtr)
return NULL; return NULL;

2
tests/bhyvexml2argvtest.c
View File

@ -35,7 +35,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto out; goto out;
if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE))) { NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) {
if (flags & FLAG_EXPECT_PARSE_ERROR) if (flags & FLAG_EXPECT_PARSE_ERROR)
ret = 0; ret = 0;
goto out; goto out;

2
tests/domainconftest.c
View File

@ -52,7 +52,7 @@ static int testGetFilesystem(const void *opaque)
abs_srcdir, data->filename) < 0) abs_srcdir, data->filename) < 0)
goto cleanup; goto cleanup;
if (!(def = virDomainDefParseFile(filename, caps, xmlopt, 0))) if (!(def = virDomainDefParseFile(filename, caps, xmlopt, NULL, 0)))
goto cleanup; goto cleanup;
fsdef = virDomainGetFilesystemForTarget(def, fsdef = virDomainGetFilesystemForTarget(def,

2
tests/qemuagenttest.c
View File

@ -182,7 +182,7 @@ testQemuAgentGetFSInfo(const void *data)
goto cleanup; goto cleanup;
if (!(def = virDomainDefParseFile(domain_filename, caps, xmlopt, if (!(def = virDomainDefParseFile(domain_filename, caps, xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE))) NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto cleanup; goto cleanup;
if (qemuMonitorTestAddAgentSyncResponse(test) < 0) if (qemuMonitorTestAddAgentSyncResponse(test) < 0)

1
tests/qemuhotplugtest.c
View File

@ -84,6 +84,7 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt,
if (!((*vm)->def = virDomainDefParseString(domxml, if (!((*vm)->def = virDomainDefParseString(domxml,
driver.caps, driver.caps,
driver.xmlopt, driver.xmlopt,
NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE))) VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto cleanup; goto cleanup;

2
tests/qemuxml2argvtest.c
View File

@ -424,7 +424,7 @@ testCompareXMLToArgv(const void *data)
parseFlags |= VIR_DOMAIN_DEF_PARSE_INACTIVE; parseFlags |= VIR_DOMAIN_DEF_PARSE_INACTIVE;
if (!(vm->def = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, if (!(vm->def = virDomainDefParseFile(xml, driver.caps, driver.xmlopt,
parseFlags))) { NULL, parseFlags))) {
if (flags & FLAG_EXPECT_PARSE_ERROR) if (flags & FLAG_EXPECT_PARSE_ERROR)
goto ok; goto ok;
goto cleanup; goto cleanup;

2
tests/securityselinuxlabeltest.c
View File

@ -189,7 +189,7 @@ testSELinuxLoadDef(const char *testname)
abs_srcdir, testname) < 0) abs_srcdir, testname) < 0)
goto cleanup; goto cleanup;
if (!(def = virDomainDefParseFile(xmlfile, caps, driver.xmlopt, 0))) if (!(def = virDomainDefParseFile(xmlfile, caps, driver.xmlopt, NULL, 0)))
goto cleanup; goto cleanup;
for (i = 0; i < def->ndisks; i++) { for (i = 0; i < def->ndisks; i++) {

2
tests/testutils.c
View File

@ -1127,7 +1127,7 @@ testCompareDomXML2XMLFiles(virCapsPtr caps, virDomainXMLOptionPtr xmlopt,
if (!live) if (!live)
format_flags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE; format_flags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE;
if (!(def = virDomainDefParseFile(infile, caps, xmlopt, parse_flags))) { if (!(def = virDomainDefParseFile(infile, caps, xmlopt, NULL, parse_flags))) {
result = TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE; result = TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE;
goto out; goto out;
} }

4
tests/xlconfigtest.c
View File

@ -89,11 +89,11 @@ testCompareParseXML(const char *xlcfg, const char *xml, bool replaceVars)
if (!(replacedXML = testReplaceVarsXML(xml))) if (!(replacedXML = testReplaceVarsXML(xml)))
goto fail; goto fail;
if (!(def = virDomainDefParseString(replacedXML, caps, xmlopt, if (!(def = virDomainDefParseString(replacedXML, caps, xmlopt,
VIR_DOMAIN_XML_INACTIVE))) NULL, VIR_DOMAIN_XML_INACTIVE)))
goto fail; goto fail;
} else { } else {
if (!(def = virDomainDefParseFile(xml, caps, xmlopt, if (!(def = virDomainDefParseFile(xml, caps, xmlopt,
VIR_DOMAIN_XML_INACTIVE))) NULL, VIR_DOMAIN_XML_INACTIVE)))
goto fail; goto fail;
} }

2
tests/xmconfigtest.c
View File

@ -63,7 +63,7 @@ testCompareParseXML(const char *xmcfg, const char *xml)
priv.caps = caps; priv.caps = caps;
conn->privateData = &priv; conn->privateData = &priv;
if (!(def = virDomainDefParseFile(xml, caps, xmlopt, if (!(def = virDomainDefParseFile(xml, caps, xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE))) VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto fail; goto fail;

2
tests/xml2sexprtest.c
View File

@ -27,7 +27,7 @@ testCompareFiles(const char *xml, const char *sexpr)
int ret = -1; int ret = -1;
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
if (!(def = virDomainDefParseFile(xml, caps, xmlopt, if (!(def = virDomainDefParseFile(xml, caps, xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE))) VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto fail; goto fail;

2
tests/xml2vmxtest.c
View File

@ -76,7 +76,7 @@ testCompareFiles(const char *xml, const char *vmx, int virtualHW_version)
char *formatted = NULL; char *formatted = NULL;
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
def = virDomainDefParseFile(xml, caps, xmlopt, def = virDomainDefParseFile(xml, caps, xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE); VIR_DOMAIN_DEF_PARSE_INACTIVE);
if (def == NULL) if (def == NULL)