[PATCH v2 1/5] conf: Drop unused parameter

Drop unused parameter from virDomainNetReleaseActualDevice method. Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com&gt; --- src/conf/domain_conf.c | 1 - src/conf/domain_conf.h | 3 +-- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 4 ++-- src/lxc/lxc_driver.c | 2 +- src/lxc/lxc_process.c | 4 ++-- src/qemu/qemu_hotplug.c | 10 +++++----- src/qemu/qemu_process.c | 2 +- 8 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6211d2a51b..9b42ac3e38 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -30276,7 +30276,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 d176bda5f8..95d8fc379d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4406,9 +4406,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 670fd2881e..ad2ad1ce0e 100644 --- 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 6c843b9054..e42a3dc0a9 100644 --- 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 c281998652..39992bdf96 100644 --- 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 20cd3a3d57..bfdcefd01b 100644 --- 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 0e45bd53e1..bf1ac241ff 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1435,7 +1435,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)); } @@ -4162,7 +4162,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)); } @@ -4198,7 +4198,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; @@ -4778,7 +4778,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)); } @@ -4896,7 +4896,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 3563ad215c..3abd3ad23a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8579,7 +8579,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)); } -- 2.43.0