[libvirt] [PATCH 11/30] conf: drop virCapsPtr param from assign addresses callback

Daniel P. Berrangé berrange at redhat.com
Wed Dec 4 14:20:54 UTC 2019


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

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 src/bhyve/bhyve_domain.c | 1 -
 src/conf/domain_conf.c   | 2 +-
 src/conf/domain_conf.h   | 1 -
 src/qemu/qemu_domain.c   | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c
index eebf5a7650..a321be54f4 100644
--- 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 8acc91de74..8dd1ff1017 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5870,7 +5870,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 af57e288e9..7e925f45d8 100644
--- 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 0076349558..362d644475 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8116,7 +8116,6 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
 
 static int
 qemuDomainDefAssignAddresses(virDomainDef *def,
-                             virCapsPtr caps G_GNUC_UNUSED,
                              unsigned int parseFlags G_GNUC_UNUSED,
                              void *opaque,
                              void *parseOpaque)
-- 
2.23.0




More information about the libvir-list mailing list