conf: Drop unused parameter

Drop unused parameter from virDomainNetReleaseActualDevice method.

Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ea6fb1e48d0e1f579c484b7f7c8f14e58e044d01..3597959e33bf056f7d7bc43ce2f887551c30dd9e 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -30268,7 +30268,6 @@ virDomainNetNotifyActualDevice(virConnectPtr conn,
 
 int
 virDomainNetReleaseActualDevice(virConnectPtr conn,
-                                virDomainDef *dom G_GNUC_UNUSED,
                                 virDomainNetDef *iface)
 {
     virNetworkPtr net = NULL;

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index bd283d42df69aa32a006eb99530f05fd3519f438..c7e5005b3b17ef971b8194ac3de851ac560737b3 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -4407,9 +4407,8 @@ virDomainNetNotifyActualDevice(virConnectPtr conn,
 
 int
 virDomainNetReleaseActualDevice(virConnectPtr conn,
-                                virDomainDef *dom,
                                 virDomainNetDef *iface)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
+    ATTRIBUTE_NONNULL(1);
 
 int
 virDomainNetBandwidthUpdate(virDomainNetDef *iface,

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 670fd2881eb43deecb39dfaf3e3a6a91a668d41c..ad2ad1ce0e440ad18203f5c85bdf67b723f90d7d 100644 (file)
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -749,7 +749,7 @@ libxlNetworkUnwindDevices(virDomainDef *def)
                 g_autoptr(virConnect) conn = virGetConnectNetwork();
 
                 if (conn)
-                    virDomainNetReleaseActualDevice(conn, def, net);
+                    virDomainNetReleaseActualDevice(conn, net);
                 else
                     VIR_WARN("Unable to release network device '%s'", NULLSTR(net->ifname));
             }

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 6c843b9054e25422313fccdc8b1067fc6bab694e..e42a3dc0a92bd9d6d01a3ac78a2b56f39d56439b 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3440,7 +3440,7 @@ libxlDomainAttachNetDevice(libxlDriverPrivate *driver,
     } else {
         virDomainNetRemoveHostdev(vm->def, net);
         if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK && conn)
-            virDomainNetReleaseActualDevice(conn, vm->def, net);
+            virDomainNetReleaseActualDevice(conn, net);
     }
     virObjectUnref(cfg);
     virErrorRestore(&save_err);
@@ -3911,7 +3911,7 @@ libxlDomainDetachNetDevice(libxlDriverPrivate *driver,
         if (detach->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
             g_autoptr(virConnect) conn = virGetConnectNetwork();
             if (conn)
-                virDomainNetReleaseActualDevice(conn, vm->def, detach);
+                virDomainNetReleaseActualDevice(conn, detach);
             else
                 VIR_WARN("Unable to release network device '%s'", NULLSTR(detach->ifname));
         }

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index c2819986525cf6114c6ee68ea26618e0ecaa8fd6..39992bdf96f0be9f3a110cc096d6cddc23359938 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -4110,7 +4110,7 @@ lxcDomainDetachDeviceNetLive(virDomainObj *vm,
         if (detach->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
             g_autoptr(virConnect) conn = virGetConnectNetwork();
             if (conn)
-                virDomainNetReleaseActualDevice(conn, vm->def, detach);
+                virDomainNetReleaseActualDevice(conn, detach);
             else
                 VIR_WARN("Unable to release network device '%s'", NULLSTR(detach->ifname));
         }

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 20cd3a3d5753ed301a194bf19a34d49078215bcf..bfdcefd01be5f5d35d78c8452ff1d4320e8ac7eb 100644 (file)
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -221,7 +221,7 @@ static void virLXCProcessCleanup(virLXCDriver *driver,
         }
         if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
             if (conn || (conn = virGetConnectNetwork()))
-                virDomainNetReleaseActualDevice(conn, vm->def, iface);
+                virDomainNetReleaseActualDevice(conn, iface);
             else
                 VIR_WARN("Unable to release network device '%s'", NULLSTR(iface->ifname));
         }
@@ -643,7 +643,7 @@ virLXCProcessSetupInterfaces(virLXCDriver *driver,
                                 virDomainNetGetActualBridgeName(iface),
                                 iface->ifname));
             if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK && netconn)
-                virDomainNetReleaseActualDevice(netconn, def, iface);
+                virDomainNetReleaseActualDevice(netconn, iface);
         }
         virErrorRestore(&save_err);
     }

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 0f7ffb6506cd2abe81dbbf2b983d305c523ba946..62436680c316d326188ee97d13e7ffa1d505715c 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1440,7 +1440,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
 
         if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
             if (conn)
-                virDomainNetReleaseActualDevice(conn, vm->def, net);
+                virDomainNetReleaseActualDevice(conn, net);
             else
                 VIR_WARN("Unable to release network device '%s'", NULLSTR(net->ifname));
         }
@@ -4167,7 +4167,7 @@ qemuDomainChangeNet(virQEMUDriver *driver,
          * no need to change the pointer in the hostdev structure */
         if (olddev->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
             if (conn || (conn = virGetConnectNetwork()))
-                virDomainNetReleaseActualDevice(conn, vm->def, olddev);
+                virDomainNetReleaseActualDevice(conn, olddev);
             else
                 VIR_WARN("Unable to release network device '%s'", NULLSTR(olddev->ifname));
         }
@@ -4208,7 +4208,7 @@ qemuDomainChangeNet(virQEMUDriver *driver,
      * replace the entire device object.
      */
     if (newdev && newdev->type == VIR_DOMAIN_NET_TYPE_NETWORK && conn)
-        virDomainNetReleaseActualDevice(conn, vm->def, newdev);
+        virDomainNetReleaseActualDevice(conn, newdev);
     virErrorRestore(&save_err);
 
     return ret;
@@ -4788,7 +4788,7 @@ qemuDomainRemoveHostDevice(virQEMUDriver *driver,
         if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
             g_autoptr(virConnect) conn = virGetConnectNetwork();
             if (conn)
-                virDomainNetReleaseActualDevice(conn, vm->def, net);
+                virDomainNetReleaseActualDevice(conn, net);
             else
                 VIR_WARN("Unable to release network device '%s'", NULLSTR(net->ifname));
         }
@@ -4906,7 +4906,7 @@ qemuDomainRemoveNetDevice(virQEMUDriver *driver,
     if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
         g_autoptr(virConnect) conn = virGetConnectNetwork();
         if (conn)
-            virDomainNetReleaseActualDevice(conn, vm->def, net);
+            virDomainNetReleaseActualDevice(conn, net);
         else
             VIR_WARN("Unable to release network device '%s'", NULLSTR(net->ifname));
     } else if (net->type == VIR_DOMAIN_NET_TYPE_ETHERNET) {

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index c1115b440f4fc45d2dec6da4f0187f3fd71844a1..fa8d8306d5d819ab01b183413d2b11edc47d7901 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8606,7 +8606,7 @@ void qemuProcessStop(virQEMUDriver *driver,
         virDomainNetRemoveHostdev(def, net);
         if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
             if (conn || (conn = virGetConnectNetwork()))
-                virDomainNetReleaseActualDevice(conn, vm->def, net);
+                virDomainNetReleaseActualDevice(conn, net);
             else
                 VIR_WARN("Unable to release network device '%s'", NULLSTR(net->ifname));
         }