net: merge virNetworkGetDHCPLeases and virNetworkGetDHCPLeasesForMAC

Instead of maintaining two very similar APIs, add the "@mac" parameter
to virNetworkGetDHCPLeases and kill virNetworkGetDHCPLeasesForMAC. Both
of those functions would return data the same way, so making @mac an
optional filter simplifies a lot of stuff.

1 files changed, 1 insertions, 7 deletions

diff --git a/src/driver.h b/src/driver.h
index 6e72e92e1e..5018068f33 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -1184,15 +1184,10 @@ typedef int
 
 typedef int
 (*virDrvNetworkGetDHCPLeases)(virNetworkPtr network,
+                              const char *mac,
                               virNetworkDHCPLeasePtr **leases,
                               unsigned int flags);
 
-typedef int
-(*virDrvNetworkGetDHCPLeasesForMAC)(virNetworkPtr network,
-                                    const char *mac,
-                                    virNetworkDHCPLeasePtr **leases,
-                                    unsigned int flags);
-
 typedef struct _virDriver virDriver;
 typedef virDriver *virDriverPtr;
 
@@ -1546,7 +1541,6 @@ struct _virNetworkDriver {
     virDrvNetworkIsActive networkIsActive;
     virDrvNetworkIsPersistent networkIsPersistent;
     virDrvNetworkGetDHCPLeases networkGetDHCPLeases;
-    virDrvNetworkGetDHCPLeasesForMAC networkGetDHCPLeasesForMAC;
 };