conf: drop virCapsPtr param from assign addresses callback

The virCapsPtr param is not used by any of the virt drivers providing
this callback.

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

diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c
index eebf5a765032890f7534c1b91071608ac5301c0d..a321be54f4aaaf4f78b4cfb2010c6bd75dd5d947 100644 (file)
--- a/src/bhyve/bhyve_domain.c
+++ b/src/bhyve/bhyve_domain.c
@@ -167,7 +167,6 @@ bhyveDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
 
 static int
 bhyveDomainDefAssignAddresses(virDomainDef *def,
-                              virCapsPtr caps G_GNUC_UNUSED,
                               unsigned int parseFlags G_GNUC_UNUSED,
                               void *opaque G_GNUC_UNUSED,
                               void *parseOpaque G_GNUC_UNUSED)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a793aa186a3495388f111b0d2053389e33955f2a..b1685a2852a9921a8fea14319f0fcf76fe414c25 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5878,7 +5878,7 @@ virDomainDefPostParse(virDomainDefPtr def,
         goto cleanup;
 
     if (xmlopt->config.assignAddressesCallback) {
-        ret = xmlopt->config.assignAddressesCallback(def, caps, parseFlags,
+        ret = xmlopt->config.assignAddressesCallback(def, parseFlags,
                                                      xmlopt->config.priv,
                                                      data.parseOpaque);
         if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0)

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 7e75ef83d41b2307e4a7fd43bfacdaa8e07ca6f5..09a36264649a8e2ecc5d5e761f8b03a5f403cb4b 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2660,7 +2660,6 @@ typedef int (*virDomainDeviceDefPostParseCallback)(virDomainDeviceDefPtr dev,
  * @opaque is opaque data set by driver (usually pointer to driver
  * private data). */
 typedef int (*virDomainDefAssignAddressesCallback)(virDomainDef *def,
-                                                   virCapsPtr caps,
                                                    unsigned int parseFlags,
                                                    void *opaque,
                                                    void *parseOpaque);

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 6159101bcc09cfa078c8523c7cd3c83919e750d0..461fadc3d73ad44cdbb38f16be1c3c0bc80c01f0 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8115,7 +8115,6 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
 
 static int
 qemuDomainDefAssignAddresses(virDomainDef *def,
-                             virCapsPtr caps G_GNUC_UNUSED,
                              unsigned int parseFlags G_GNUC_UNUSED,
                              void *opaque,
                              void *parseOpaque)