External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-27 15:05:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

virdnsmasq: remove binaryPath argument from dnsmasqCapsNewFromBinary

Browse Source 
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>
This commit is contained in:
Pavel Hrdina 2021-04-14 17:57:08 +02:00
parent 84fd53f555
commit a1ea955806
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/bridge_driver.c
View File

@ -130,7 +130,7 @@ networkDnsmasqCapsRefresh(virNetworkDriverState *driver)
{ {
dnsmasqCaps *caps; dnsmasqCaps *caps;
if (!(caps = dnsmasqCapsNewFromBinary(DNSMASQ))) if (!(caps = dnsmasqCapsNewFromBinary()))
return -1; return -1;
networkDriverLock(driver); networkDriverLock(driver);
@ -749,7 +749,7 @@ networkStateInitialize(bool privileged,
goto error; goto error;
/* if this fails now, it will be retried later with networkDnsmasqCapsRefresh() */ /* 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())) if (!(network_driver->networks = virNetworkObjListNew()))
goto error; goto error;

4
src/util/virdnsmasq.c
View File

@ -759,9 +759,9 @@ dnsmasqCapsNewFromBuffer(const char *buf)
} }
dnsmasqCaps * dnsmasqCaps *
dnsmasqCapsNewFromBinary(const char *binaryPath) dnsmasqCapsNewFromBinary(void)
{ {
dnsmasqCaps *caps = dnsmasqCapsNewEmpty(binaryPath); dnsmasqCaps *caps = dnsmasqCapsNewEmpty(DNSMASQ);
if (!caps) if (!caps)
return NULL; return NULL;

2
src/util/virdnsmasq.h
View File

@ -100,7 +100,7 @@ int dnsmasqDelete(const dnsmasqContext *ctx);
int dnsmasqReload(pid_t pid); int dnsmasqReload(pid_t pid);
dnsmasqCaps *dnsmasqCapsNewFromBuffer(const char *buf); dnsmasqCaps *dnsmasqCapsNewFromBuffer(const char *buf);
dnsmasqCaps *dnsmasqCapsNewFromBinary(const char *binaryPath); dnsmasqCaps *dnsmasqCapsNewFromBinary(void);
bool dnsmasqCapsGet(dnsmasqCaps *caps, dnsmasqCapsFlags flag); bool dnsmasqCapsGet(dnsmasqCaps *caps, dnsmasqCapsFlags flag);
const char *dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps); const char *dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps);
unsigned long dnsmasqCapsGetVersion(dnsmasqCaps *caps); unsigned long dnsmasqCapsGetVersion(dnsmasqCaps *caps);