virdnsmasq: remove binaryPath argument from dnsmasqCapsNewFromBinary

We always pass DNSMASQ so there is no need for the argument at all.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 706a557ee84edf79ff6e3263dad1dff49ef337e2..ee3f9dab0af646403651f86f22b1e7bac3451935 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -130,7 +130,7 @@ networkDnsmasqCapsRefresh(virNetworkDriverState *driver)
 {
     dnsmasqCaps *caps;
 
-    if (!(caps = dnsmasqCapsNewFromBinary(DNSMASQ)))
+    if (!(caps = dnsmasqCapsNewFromBinary()))
         return -1;
 
     networkDriverLock(driver);
@@ -749,7 +749,7 @@ networkStateInitialize(bool privileged,
         goto error;
 
     /* if this fails now, it will be retried later with networkDnsmasqCapsRefresh() */
-    network_driver->dnsmasqCaps = dnsmasqCapsNewFromBinary(DNSMASQ);
+    network_driver->dnsmasqCaps = dnsmasqCapsNewFromBinary();
 
     if (!(network_driver->networks = virNetworkObjListNew()))
         goto error;

diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index 82a26e83e986045c0e2a5498b9cd66b7fa364d42..f2f606913fdf549a4667e3a65582269805ec9144 100644 (file)
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -759,9 +759,9 @@ dnsmasqCapsNewFromBuffer(const char *buf)
 }
 
 dnsmasqCaps *
-dnsmasqCapsNewFromBinary(const char *binaryPath)
+dnsmasqCapsNewFromBinary(void)
 {
-    dnsmasqCaps *caps = dnsmasqCapsNewEmpty(binaryPath);
+    dnsmasqCaps *caps = dnsmasqCapsNewEmpty(DNSMASQ);
 
     if (!caps)
         return NULL;

diff --git a/src/util/virdnsmasq.h b/src/util/virdnsmasq.h
index cf6d50fe38f05fb1b927c8d1bff664363fe096a9..ee9839cd250a0be66437264bc59119d8f070e402 100644 (file)
--- a/src/util/virdnsmasq.h
+++ b/src/util/virdnsmasq.h
@@ -100,7 +100,7 @@ int              dnsmasqDelete(const dnsmasqContext *ctx);
 int              dnsmasqReload(pid_t pid);
 
 dnsmasqCaps *dnsmasqCapsNewFromBuffer(const char *buf);
-dnsmasqCaps *dnsmasqCapsNewFromBinary(const char *binaryPath);
+dnsmasqCaps *dnsmasqCapsNewFromBinary(void);
 bool dnsmasqCapsGet(dnsmasqCaps *caps, dnsmasqCapsFlags flag);
 const char *dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps);
 unsigned long dnsmasqCapsGetVersion(dnsmasqCaps *caps);