conf: drop virCapsPtr param from device post parse callback

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>

diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c
index c8d33b4e000f4936c0e12bc4660d71977694c170..82910ea261406490d29a2d306a5e41f110a1f5fb 100644 (file)
--- a/src/bhyve/bhyve_domain.c
+++ b/src/bhyve/bhyve_domain.c
@@ -132,7 +132,6 @@ bhyveDomainDiskDefAssignAddress(bhyveConnPtr driver,
 static int
 bhyveDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
                               const virDomainDef *def,
-                              virCapsPtr caps G_GNUC_UNUSED,
                               unsigned int parseFlags G_GNUC_UNUSED,
                               void *opaque,
                               void *parseOpaque G_GNUC_UNUSED)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index fd38f0b798da3ca5ad56df9532a76ceafb533349..87be5afb5e044bf65dd3ee50c506c33fbc9c28ec 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5215,7 +5215,6 @@ virDomainVsockDefPostParse(virDomainVsockDefPtr vsock)
 static int
 virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev,
                                   const virDomainDef *def,
-                                  virCapsPtr caps G_GNUC_UNUSED,
                                   unsigned int parseFlags G_GNUC_UNUSED,
                                   virDomainXMLOptionPtr xmlopt)
 {
@@ -5470,7 +5469,6 @@ virDomainDeviceDefPostParseCheckFeatures(virDomainDeviceDefPtr dev,
 static int
 virDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
                             const virDomainDef *def,
-                            virCapsPtr caps,
                             unsigned int flags,
                             virDomainXMLOptionPtr xmlopt,
                             void *parseOpaque)
@@ -5478,14 +5476,14 @@ virDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
     int ret;
 
     if (xmlopt->config.devicesPostParseCallback) {
-        ret = xmlopt->config.devicesPostParseCallback(dev, def, caps, flags,
+        ret = xmlopt->config.devicesPostParseCallback(dev, def, flags,
                                                       xmlopt->config.priv,
                                                       parseOpaque);
         if (ret < 0)
             return ret;
     }
 
-    if ((ret = virDomainDeviceDefPostParseCommon(dev, def, caps, flags, xmlopt)) < 0)
+    if ((ret = virDomainDeviceDefPostParseCommon(dev, def, flags, xmlopt)) < 0)
         return ret;
 
     if (virDomainDeviceDefPostParseCheckFeatures(dev, xmlopt) < 0)
@@ -5497,7 +5495,6 @@ virDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
 static int
 virDomainDeviceDefPostParseOne(virDomainDeviceDefPtr dev,
                                const virDomainDef *def,
-                               virCapsPtr caps,
                                unsigned int flags,
                                virDomainXMLOptionPtr xmlopt,
                                void *parseOpaque)
@@ -5513,7 +5510,7 @@ virDomainDeviceDefPostParseOne(virDomainDeviceDefPtr dev,
         parseOpaque = data;
     }
 
-    ret = virDomainDeviceDefPostParse(dev, def, caps, flags, xmlopt, parseOpaque);
+    ret = virDomainDeviceDefPostParse(dev, def, flags, xmlopt, parseOpaque);
 
     if (data && xmlopt->config.domainPostParseDataFree)
         xmlopt->config.domainPostParseDataFree(data);
@@ -5523,7 +5520,6 @@ virDomainDeviceDefPostParseOne(virDomainDeviceDefPtr dev,
 
 
 struct virDomainDefPostParseDeviceIteratorData {
-    virCapsPtr caps;
     virDomainXMLOptionPtr xmlopt;
     void *parseOpaque;
     unsigned int parseFlags;
@@ -5537,7 +5533,7 @@ virDomainDefPostParseDeviceIterator(virDomainDefPtr def,
                                     void *opaque)
 {
     struct virDomainDefPostParseDeviceIteratorData *data = opaque;
-    return virDomainDeviceDefPostParse(dev, def, data->caps,
+    return virDomainDeviceDefPostParse(dev, def,
                                        data->parseFlags, data->xmlopt,
                                        data->parseOpaque);
 }
@@ -5814,7 +5810,7 @@ virDomainDefPostParseCheckFailure(virDomainDefPtr def,
 
 int
 virDomainDefPostParse(virDomainDefPtr def,
-                      virCapsPtr caps,
+                      virCapsPtr caps G_GNUC_UNUSED,
                       unsigned int parseFlags,
                       virDomainXMLOptionPtr xmlopt,
                       void *parseOpaque)
@@ -5822,7 +5818,6 @@ virDomainDefPostParse(virDomainDefPtr def,
     int ret = -1;
     bool localParseOpaque = false;
     struct virDomainDefPostParseDeviceIteratorData data = {
-        .caps = caps,
         .xmlopt = xmlopt,
         .parseFlags = parseFlags,
         .parseOpaque = parseOpaque,
@@ -7125,7 +7120,6 @@ virDomainDefValidate(virDomainDefPtr def,
                      virDomainXMLOptionPtr xmlopt)
 {
     struct virDomainDefPostParseDeviceIteratorData data = {
-        .caps = caps,
         .xmlopt = xmlopt,
         .parseFlags = parseFlags,
     };
@@ -16427,7 +16421,7 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xmlopt,
 virDomainDeviceDefPtr
 virDomainDeviceDefParse(const char *xmlStr,
                         const virDomainDef *def,
-                        virCapsPtr caps,
+                        virCapsPtr caps G_GNUC_UNUSED,
                         virDomainXMLOptionPtr xmlopt,
                         void *parseOpaque,
                         unsigned int flags)
@@ -16585,7 +16579,7 @@ virDomainDeviceDefParse(const char *xmlStr,
     }
 
     /* callback to fill driver specific device aspects */
-    if (virDomainDeviceDefPostParseOne(dev, def, caps, flags,
+    if (virDomainDeviceDefPostParseOne(dev, def, flags,
                                        xmlopt, parseOpaque) < 0)
         return NULL;
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 2903ebe9ba3fd4f8ffcfa94477ababbe3e6ffb53..844340e67ce1e205a2938f5e9be5ba6de1159624 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2648,7 +2648,6 @@ typedef int (*virDomainDefPostParseCallback)(virDomainDefPtr def,
  * private data). */
 typedef int (*virDomainDeviceDefPostParseCallback)(virDomainDeviceDefPtr dev,
                                                    const virDomainDef *def,
-                                                   virCapsPtr caps,
                                                    unsigned int parseFlags,
                                                    void *opaque,
                                                    void *parseOpaque);

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 2524d17eb4ca68658e7ba3608895aeac2c11056c..dfc8d8b6111a3b9b0e99c744bbbde82fceabf72a 100644 (file)
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -278,7 +278,6 @@ virDomainXMLPrivateDataCallbacks libxlDomainXMLPrivateDataCallbacks = {
 static int
 libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
                               const 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/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index 8b27bc95af8194a49b5dbee4a1474f5c3f5ada77..2439ec4f4b78067a75cd53411e8f80e1b7870b80 100644 (file)
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -376,7 +376,6 @@ virLXCDomainDefPostParse(virDomainDefPtr def,
 static int
 virLXCDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
                                const virDomainDef *def G_GNUC_UNUSED,
-                               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/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 5057f9652e9e004da2f95309eeb8d5573f3e285e..a15d68d37f69fcdf48dddab13189b8861b8e7561 100644 (file)
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -1103,7 +1103,6 @@ openvzDomainDefPostParse(virDomainDefPtr def,
 static int
 openvzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
                                const virDomainDef *def G_GNUC_UNUSED,
-                               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/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 3c809378c3f5d94440545187776c701813e3a165..b22063642e7613d86c171fb4cf7faa093d3e003d 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -1079,7 +1079,6 @@ phypDomainDefPostParse(virDomainDefPtr def,
 static int
 phypDomainDeviceDefPostParse(virDomainDeviceDefPtr dev G_GNUC_UNUSED,
                              const virDomainDef *def G_GNUC_UNUSED,
-                             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/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 9c013a21ae1c41f8e4d9d8eb4ff5836b5542aa4f..24aae6fb826aa209f99d37be71d090b9baef12f9 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8031,7 +8031,6 @@ qemuDomainHostdevDefPostParse(virDomainHostdevDefPtr hostdev,
 static int
 qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
                              const virDomainDef *def,
-                             virCapsPtr caps G_GNUC_UNUSED,
                              unsigned int parseFlags,
                              void *opaque,
                              void *parseOpaque)

diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 301f43d9e8699f4553ae945cae24190dce24ee41..eb2fcd438b2aae796cd913e6dea5582999910af2 100644 (file)
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -133,7 +133,6 @@ vmwareDomainDefPostParse(virDomainDefPtr def,
 static int
 vmwareDomainDeviceDefPostParse(virDomainDeviceDefPtr dev G_GNUC_UNUSED,
                                const virDomainDef *def G_GNUC_UNUSED,
-                               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/vmx/vmx.c b/src/vmx/vmx.c
index 3f8324ce899c255184a6587113fd0bee7204ec7b..093092b701b679c1aa35e47ea211f13ce7254483 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -546,7 +546,6 @@ virVMXDomainDefPostParse(virDomainDefPtr def,
 static int
 virVMXDomainDevicesDefPostParse(virDomainDeviceDefPtr dev G_GNUC_UNUSED,
                                 const virDomainDef *def G_GNUC_UNUSED,
-                                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/vz/vz_driver.c b/src/vz/vz_driver.c
index f54bdd49dbc3489c55681ecebaf2866802980acb..78aa85825a669f3abfeac046775941b285156a47 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -271,7 +271,6 @@ vzDomainDefValidate(const virDomainDef *def,
 static int
 vzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
                            const virDomainDef *def,
-                           virCapsPtr caps G_GNUC_UNUSED,
                            unsigned int parseFlags G_GNUC_UNUSED,
                            void *opaque G_GNUC_UNUSED,
                            void *parseOpaque G_GNUC_UNUSED)