External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

vz: drop virCapsPtr param from many API domain parse calls

Browse Source 
This fixes commit bf9d812956100442a195d99773620e1795b8633d

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-12-09 14:43:15 +00:00
parent ef7526cc19
commit 66d4fd7009
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/vz/vz_driver.c
View File

@ -1497,7 +1497,7 @@ static int vzDomainAttachDeviceFlags(virDomainPtr domain, const char *xml,
if (virDomainAttachDeviceFlagsEnsureACL(domain->conn, dom->def, flags) < 0) if (virDomainAttachDeviceFlagsEnsureACL(domain->conn, dom->def, flags) < 0)
goto cleanup; goto cleanup;
dev = virDomainDeviceDefParse(xml, dom->def, driver->caps, dev = virDomainDeviceDefParse(xml, dom->def,
driver->xmlopt, NULL, VIR_DOMAIN_XML_INACTIVE); driver->xmlopt, NULL, VIR_DOMAIN_XML_INACTIVE);
if (dev == NULL) if (dev == NULL)
goto cleanup; goto cleanup;
@ -1553,7 +1553,7 @@ static int vzDomainDetachDeviceFlags(virDomainPtr domain, const char *xml,
if (virDomainDetachDeviceFlagsEnsureACL(domain->conn, dom->def, flags) < 0) if (virDomainDetachDeviceFlagsEnsureACL(domain->conn, dom->def, flags) < 0)
goto cleanup; goto cleanup;
dev = virDomainDeviceDefParse(xml, dom->def, driver->caps, dev = virDomainDeviceDefParse(xml, dom->def,
driver->xmlopt, NULL, driver->xmlopt, NULL,
VIR_DOMAIN_XML_INACTIVE | VIR_DOMAIN_XML_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE);
@ -1645,7 +1645,7 @@ static int vzDomainUpdateDeviceFlags(virDomainPtr domain,
if (vzCheckConfigUpdateFlags(dom, &flags) < 0) if (vzCheckConfigUpdateFlags(dom, &flags) < 0)
goto cleanup; goto cleanup;
if (!(dev = virDomainDeviceDefParse(xml, dom->def, driver->caps, if (!(dev = virDomainDeviceDefParse(xml, dom->def,
driver->xmlopt, NULL, driver->xmlopt, NULL,
VIR_DOMAIN_XML_INACTIVE))) VIR_DOMAIN_XML_INACTIVE)))
goto cleanup; goto cleanup;
@ -2266,7 +2266,6 @@ vzDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, unsigned int flags)
virUUIDFormat(snapshot->domain->uuid, uuidstr); virUUIDFormat(snapshot->domain->uuid, uuidstr);
xml = virDomainSnapshotDefFormat(uuidstr, virDomainSnapshotObjGetDef(snap), xml = virDomainSnapshotDefFormat(uuidstr, virDomainSnapshotObjGetDef(snap),
privconn->driver->caps,
privconn->driver->xmlopt, privconn->driver->xmlopt,
virDomainSnapshotFormatConvertXMLFlags(flags)); virDomainSnapshotFormatConvertXMLFlags(flags));
@ -2597,7 +2596,7 @@ vzDomainSnapshotCreateXML(virDomainPtr domain,
if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE) if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE)
parse_flags |= VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE; parse_flags |= VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE;
if (!(def = virDomainSnapshotDefParseString(xmlDesc, driver->caps, if (!(def = virDomainSnapshotDefParseString(xmlDesc,
driver->xmlopt, NULL, NULL, driver->xmlopt, NULL, NULL,
parse_flags))) parse_flags)))
goto cleanup; goto cleanup;