]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
conf: drop virCapsPtr param from domain validate callback
authorDaniel P. Berrangé <berrange@redhat.com>
Tue, 26 Nov 2019 16:53:53 +0000 (16:53 +0000)
committerDaniel P. Berrangé <berrange@redhat.com>
Mon, 9 Dec 2019 10:17:27 +0000 (10:17 +0000)
None of the impls of this callback require the virCapsPtr param.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
src/conf/domain_conf.c
src/conf/domain_conf.h
src/qemu/qemu_domain.c
src/vz/vz_driver.c

index 87be5afb5e044bf65dd3ee50c506c33fbc9c28ec..8cac2f788ef25f77b737a026eb53196243f43729 100644 (file)
@@ -7115,7 +7115,7 @@ virDomainDefValidateInternal(const virDomainDef *def,
  */
 int
 virDomainDefValidate(virDomainDefPtr def,
-                     virCapsPtr caps,
+                     virCapsPtr caps G_GNUC_UNUSED,
                      unsigned int parseFlags,
                      virDomainXMLOptionPtr xmlopt)
 {
@@ -7130,7 +7130,7 @@ virDomainDefValidate(virDomainDefPtr def,
 
     /* call the domain config callback */
     if (xmlopt->config.domainValidateCallback &&
-        xmlopt->config.domainValidateCallback(def, caps, xmlopt->config.priv) < 0)
+        xmlopt->config.domainValidateCallback(def, xmlopt->config.priv) < 0)
         return -1;
 
     /* iterate the devices */
index 844340e67ce1e205a2938f5e9be5ba6de1159624..c8f8d0869fd29ec08e725b57ec10249211406e4a 100644 (file)
@@ -2671,7 +2671,6 @@ typedef void (*virDomainDefPostParseDataFree)(void *parseOpaque);
  * for configurations that were previously accepted. This shall not modify the
  * config. */
 typedef int (*virDomainDefValidateCallback)(const virDomainDef *def,
-                                            virCapsPtr caps,
                                             void *opaque);
 
 /* Called once per device, for adjusting per-device settings while
index 24aae6fb826aa209f99d37be71d090b9baef12f9..8ce7bda8662f24d85f79cc61f3f11351b8a2a356 100644 (file)
@@ -4972,7 +4972,6 @@ qemuDomainValidateCpuCount(const virDomainDef *def,
 
 static int
 qemuDomainDefValidate(const virDomainDef *def,
-                      virCapsPtr caps G_GNUC_UNUSED,
                       void *opaque)
 {
     virQEMUDriverPtr driver = opaque;
index 78aa85825a669f3abfeac046775941b285156a47..35baab1b82ec73de2eedb40be9a202777cdf2140 100644 (file)
@@ -259,7 +259,6 @@ vzDomainDefPostParse(virDomainDefPtr def,
 
 static int
 vzDomainDefValidate(const virDomainDef *def,
-                    virCapsPtr caps G_GNUC_UNUSED,
                     void *opaque)
 {
     if (vzCheckUnsupportedControllers(def, opaque) < 0)