From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 14 Apr 2021 15:57:08 +0000 (+0200)
Subject: virdnsmasq: remove binaryPath argument from dnsmasqCapsNewFromBinary
X-Git-Tag: v7.3.0-rc1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1ea955806c9f0233c9a1d22c3ac740546cbd0ef;p=thirdparty%2Flibvirt.git

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 706a557ee8..ee3f9dab0a 100644
--- 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 82a26e83e9..f2f606913f 100644
--- 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 cf6d50fe38..ee9839cd25 100644
--- 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);