From: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date: Mon, 5 Jan 2015 17:49:24 +0000 (+0530)
Subject: networkGetDHCPLeases: Remove unnecessary error reporting
X-Git-Tag: v1.2.12-rc1~104
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18ec863d19bdaf517e26642f794b7ee4d1d2c53f;p=thirdparty%2Flibvirt.git

networkGetDHCPLeases: Remove unnecessary error reporting

Lack of a lease (whether mac is given or not) is a normal expected
scenario, since we are already filling in rv with nleases (which is
okay as 0 if there is no lease).  There is no need to raise an error.

This fixes:

> virsh # net-dhcp-leases --mac 00:50:56:c0:00:01  default
> error: Failed to get leases info for default
> error: internal error: no lease with matching MAC address: 00:50:56:c0:00:01

Signed-off-by: Nehal J Wani <nehaljw.kkd1@gmail.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 6055c712a1..fca60f112c 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -3654,12 +3654,6 @@ networkGetDHCPLeases(virNetworkPtr network,
         VIR_FREE(lease);
     }
 
-    if (need_results && mac && !leases_ret) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("no lease with matching MAC address: %s"), mac);
-        goto error;
-    }
-
     if (leases_ret) {
         /* NULL terminated array */
         ignore_value(VIR_REALLOC_N(leases_ret, nleases + 1));