conf: drop virCapsPtr param from domain post parse & validate APIs

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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 740831cac95935decb314bd130bee86263f33b05..24d7f4ee9e3bd5adf0c9d466c4a17ad29ca047ec 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5810,7 +5810,6 @@ virDomainDefPostParseCheckFailure(virDomainDefPtr def,
 
 int
 virDomainDefPostParse(virDomainDefPtr def,
-                      virCapsPtr caps G_GNUC_UNUSED,
                       unsigned int parseFlags,
                       virDomainXMLOptionPtr xmlopt,
                       void *parseOpaque)
@@ -7115,7 +7114,6 @@ virDomainDefValidateInternal(const virDomainDef *def,
  */
 int
 virDomainDefValidate(virDomainDefPtr def,
-                     virCapsPtr caps G_GNUC_UNUSED,
                      unsigned int parseFlags,
                      virDomainXMLOptionPtr xmlopt)
 {
@@ -21566,11 +21564,11 @@ virDomainObjParseXML(xmlDocPtr xml,
         parseOpaque = xmlopt->privateData.getParseOpaque(obj);
 
     /* callback to fill driver specific domain aspects */
-    if (virDomainDefPostParse(obj->def, caps, flags, xmlopt, parseOpaque) < 0)
+    if (virDomainDefPostParse(obj->def, flags, xmlopt, parseOpaque) < 0)
         goto error;
 
     /* validate configuration */
-    if (virDomainDefValidate(obj->def, caps, flags, xmlopt) < 0)
+    if (virDomainDefValidate(obj->def, flags, xmlopt) < 0)
         goto error;
 
     return obj;
@@ -21655,11 +21653,11 @@ virDomainDefParseNode(xmlDocPtr xml,
         return NULL;
 
     /* callback to fill driver specific domain aspects */
-    if (virDomainDefPostParse(def, caps, flags, xmlopt, parseOpaque) < 0)
+    if (virDomainDefPostParse(def, flags, xmlopt, parseOpaque) < 0)
         return NULL;
 
     /* validate configuration */
-    if (virDomainDefValidate(def, caps, flags, xmlopt) < 0)
+    if (virDomainDefValidate(def, flags, xmlopt) < 0)
         return NULL;
 
     return g_steal_pointer(&def);

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index c4b866db7a6a0fb8340e8711f5eba3901722632f..0af656002eae28595f2ca138ec836ffc76301544 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2783,7 +2783,6 @@ virDomainSCSIDriveAddressIsUsed(const virDomainDef *def,
                                 const virDomainDeviceDriveAddress *addr);
 
 int virDomainDefPostParse(virDomainDefPtr def,
-                          virCapsPtr caps,
                           unsigned int parseFlags,
                           virDomainXMLOptionPtr xmlopt,
                           void *parseOpaque);
@@ -2796,7 +2795,6 @@ int virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm,
 bool virDomainDeviceAliasIsUserAlias(const char *aliasStr);
 
 int virDomainDefValidate(virDomainDefPtr def,
-                         virCapsPtr caps,
                          unsigned int parseFlags,
                          virDomainXMLOptionPtr xmlopt);
 

diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
index 396adf6dac140ba0064cad55569f33e0d9653f85..18ea4a8d957cfd53c5109aea535453d335d88631 100644 (file)
--- a/src/libxl/xen_xl.c
+++ b/src/libxl/xen_xl.c
@@ -1213,7 +1213,7 @@ xenParseXL(virConfPtr conf,
     if (xenParseXLChannel(conf, def) < 0)
         goto cleanup;
 
-    if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
+    if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
                               xmlopt, NULL) < 0)
         goto cleanup;
 

diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c
index 88cf9ac5b0270ad3bb0dec3213fa4012f0b2fb61..1b462d04874f72c209ccc9eecb6e09567c1c68d5 100644 (file)
--- a/src/libxl/xen_xm.c
+++ b/src/libxl/xen_xm.c
@@ -467,7 +467,7 @@ xenParseXM(virConfPtr conf,
     if (xenParseXMInputDevs(conf, def) < 0)
          goto cleanup;
 
-    if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
+    if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
                               xmlopt, NULL) < 0)
         goto cleanup;
 

diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index 7e696fd2f02adfe05baa71efb43c52d610411ba6..e9b83653b535ba66fdacdea2b93fda470429af95 100644 (file)
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -1055,7 +1055,7 @@ lxcSetCapDrop(virDomainDefPtr def, virConfPtr properties)
 
 virDomainDefPtr
 lxcParseConfigString(const char *config,
-                     virCapsPtr caps,
+                     virCapsPtr caps G_GNUC_UNUSED,
                      virDomainXMLOptionPtr xmlopt)
 {
     virDomainDefPtr vmdef = NULL;
@@ -1166,7 +1166,7 @@ lxcParseConfigString(const char *config,
     /* lxc.cap.drop */
     lxcSetCapDrop(vmdef, properties);
 
-    if (virDomainDefPostParse(vmdef, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
+    if (virDomainDefPostParse(vmdef, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
                               xmlopt, NULL) < 0)
         goto error;
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index fca501044ae1b37db5cc086d586e7319a2e1a82c..35849171942af9e85342c66db649948dd08ced78 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -8101,7 +8101,7 @@ qemuCheckDiskConfigAgainstDomain(const virDomainDef *def,
 static int
 qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
                              virDomainDeviceDefPtr dev,
-                             virCapsPtr caps,
+                             virCapsPtr caps G_GNUC_UNUSED,
                              virQEMUCapsPtr qemuCaps,
                              unsigned int parse_flags,
                              virDomainXMLOptionPtr xmlopt)
@@ -8301,7 +8301,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
          return -1;
     }
 
-    if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, qemuCaps) < 0)
+    if (virDomainDefPostParse(vmdef, parse_flags, xmlopt, qemuCaps) < 0)
         return -1;
 
     return 0;
@@ -8311,7 +8311,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
 static int
 qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
                              virDomainDeviceDefPtr dev,
-                             virCapsPtr caps,
+                             virCapsPtr caps G_GNUC_UNUSED,
                              virQEMUCapsPtr qemuCaps,
                              unsigned int parse_flags,
                              virDomainXMLOptionPtr xmlopt)
@@ -8504,7 +8504,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
         return -1;
     }
 
-    if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, qemuCaps) < 0)
+    if (virDomainDefPostParse(vmdef, parse_flags, xmlopt, qemuCaps) < 0)
         return -1;
 
     return 0;
@@ -8513,7 +8513,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
 static int
 qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef,
                              virDomainDeviceDefPtr dev,
-                             virCapsPtr caps,
+                             virCapsPtr caps G_GNUC_UNUSED,
                              virQEMUCapsPtr qemuCaps,
                              unsigned int parse_flags,
                              virDomainXMLOptionPtr xmlopt)
@@ -8612,7 +8612,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef,
         return -1;
     }
 
-    if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, qemuCaps) < 0)
+    if (virDomainDefPostParse(vmdef, parse_flags, xmlopt, qemuCaps) < 0)
         return -1;
 
     return 0;

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 51c6e7889a4e93fcb55bae70c88bdb8c2b388b41..aca7b991c564498558a86d934c7a29bfff142966 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5382,7 +5382,7 @@ qemuProcessStartValidate(virQEMUDriverPtr driver,
      * VM that was running before (migration, snapshots, save). It's more
      * important to start such VM than keep the configuration clean */
     if ((flags & VIR_QEMU_PROCESS_START_NEW) &&
-        virDomainDefValidate(vm->def, caps, 0, driver->xmlopt) < 0)
+        virDomainDefValidate(vm->def, 0, driver->xmlopt) < 0)
         return -1;
 
     if (qemuProcessStartValidateGraphics(vm) < 0)
@@ -5581,7 +5581,7 @@ qemuProcessInit(virQEMUDriverPtr driver,
         VIR_DEBUG("re-running the post parse callback");
 
         /* we don't have the private copy of qemuCaps at this point */
-        if (virDomainDefPostParse(vm->def, caps, 0, driver->xmlopt, NULL) < 0)
+        if (virDomainDefPostParse(vm->def, 0, driver->xmlopt, NULL) < 0)
             goto cleanup;
     }
 

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 093092b701b679c1aa35e47ea211f13ce7254483..df5eafbd448fbe0c03ccec9b3c8563f213ce2257 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -1276,7 +1276,7 @@ virVMXConfigScanResultsCollector(const char* name,
 virDomainDefPtr
 virVMXParseConfig(virVMXContext *ctx,
                   virDomainXMLOptionPtr xmlopt,
-                  virCapsPtr caps,
+                  virCapsPtr caps G_GNUC_UNUSED,
                   const char *vmx)
 {
     bool success = false;
@@ -1845,7 +1845,7 @@ virVMXParseConfig(virVMXContext *ctx,
         }
     }
 
-    if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
+    if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
                               xmlopt, NULL) < 0)
         goto cleanup;