From: Daniel P. Berrangé <berrange@redhat.com>
Date: Mon, 9 Dec 2019 14:43:15 +0000 (+0000)
Subject: vz: drop virCapsPtr param from many API domain parse calls
X-Git-Tag: v6.0.0-rc1~427
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66d4fd70096e37373ff4d682f0ac10c42251e288;p=thirdparty%2Flibvirt.git

vz: drop virCapsPtr param from many API domain parse calls

This fixes commit bf9d812956100442a195d99773620e1795b8633d

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

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