[PATCH 11/15] vbox: Drop @networkName from UIDHCPServer::Start()
The @networkName argument of UIDHCPServer::Start() callback is
unused. Drop it and also its propagation from parent functions.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/vbox/vbox_network.c | 2 --
src/vbox/vbox_tmpl.c | 2 +-
src/vbox/vbox_uniformed_api.h | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c
index f369e466ab..111bb7144a 100644
--- a/src/vbox/vbox_network.c
+++ b/src/vbox/vbox_network.c
@@ -499,7 +499,6 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool
start,
if (start)
gVBoxAPI.UIDHCPServer.Start(dhcpServer,
networkNameUtf16,
- networkInterfaceNameUtf16,
trunkTypeUtf16);
VBOX_UTF16_FREE(ipAddressUtf16);
@@ -740,7 +739,6 @@ static int vboxNetworkCreate(virNetworkPtr network)
gVBoxAPI.UIDHCPServer.Start(dhcpServer,
networkNameUtf16,
- networkInterfaceNameUtf16,
trunkTypeUtf16);
VBOX_UTF16_FREE(trunkTypeUtf16);
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index fc72a9e001..3aaa6b4c81 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -2087,7 +2087,7 @@ _dhcpServerSetConfiguration(IDHCPServer *dhcpServer, PRUnichar
*IPAddress,
}
static nsresult
-_dhcpServerStart(IDHCPServer *dhcpServer, PRUnichar *networkName G_GNUC_UNUSED,
+_dhcpServerStart(IDHCPServer *dhcpServer,
PRUnichar *trunkName, PRUnichar *trunkType)
{
return dhcpServer->vtbl->Start(dhcpServer,
diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h
index 3416c8bb6b..316f0d8b11 100644
--- a/src/vbox/vbox_uniformed_api.h
+++ b/src/vbox/vbox_uniformed_api.h
@@ -482,7 +482,7 @@ typedef struct {
nsresult (*SetConfiguration)(IDHCPServer *dhcpServer, PRUnichar *IPAddress,
PRUnichar *networkMask, PRUnichar *FromIPAddress,
PRUnichar *ToIPAddress);
- nsresult (*Start)(IDHCPServer *dhcpServer, PRUnichar *networkName,
+ nsresult (*Start)(IDHCPServer *dhcpServer,
PRUnichar *trunkName, PRUnichar *trunkType);
nsresult (*Stop)(IDHCPServer *dhcpServer);
} vboxUniformedIDHCPServer;
--
2.39.1