[libvirt] [PATCH 13/30] conf: drop virCapsPtr param from post parse data alloc callback

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


The only user of this callback did not require the virCapsPtr parameter.

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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7327752810..164c313ac6 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5498,7 +5498,7 @@ virDomainDeviceDefPostParseOne(virDomainDeviceDefPtr dev,
     int ret;
 
     if (!parseOpaque && xmlopt->config.domainPostParseDataAlloc) {
-        if (xmlopt->config.domainPostParseDataAlloc(def, caps, flags,
+        if (xmlopt->config.domainPostParseDataAlloc(def, flags,
                                                     xmlopt->config.priv,
                                                     &data) < 0)
             return -1;
@@ -5833,7 +5833,7 @@ virDomainDefPostParse(virDomainDefPtr def,
 
     if (!data.parseOpaque &&
         xmlopt->config.domainPostParseDataAlloc) {
-        ret = xmlopt->config.domainPostParseDataAlloc(def, caps, parseFlags,
+        ret = xmlopt->config.domainPostParseDataAlloc(def, parseFlags,
                                                       xmlopt->config.priv,
                                                       &data.parseOpaque);
 
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index cdbd42351f..86d0b47a66 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2664,7 +2664,6 @@ typedef int (*virDomainDefAssignAddressesCallback)(virDomainDef *def,
                                                    void *parseOpaque);
 
 typedef int (*virDomainDefPostParseDataAlloc)(const 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 3c06b8a104..70683eb83a 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8143,7 +8143,6 @@ qemuDomainDefAssignAddresses(virDomainDef *def,
 
 static int
 qemuDomainPostParseDataAlloc(const 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