]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
conf: drop virCapsPtr param from post parse data alloc 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)
The only user of this callback did not require the virCapsPtr parameter.

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

index b59b43f33da1ea8140fcb26ba6e4e8ff94fff9fb..7512d407d938184cf628c236bf14d9b446b4258a 100644 (file)
@@ -5506,7 +5506,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;
@@ -5841,7 +5841,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);
 
index bbce0a20597135b3d4be784658ef811e090ff45b..6eb16760bed7603e43a78a8f537157ce900e4f9c 100644 (file)
@@ -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);
index 45c4ca3995665e0f10b9c1aab3143ed74d46de43..5fa9409a3f3519edd4f23780f736f1ad84b9105f 100644 (file)
@@ -8142,7 +8142,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)