[libvirt] [PATCH] networkGetDHCPLeases: Remove unnecessary error reporting

Lack of a lease (whether mac is given or not) is a normal expected scenario. There is no need to raise an error. Signed-off-by: Nehal J Wani <nehaljw.kkd1@gmail.com> --- src/network/bridge_driver.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 29222d0..6a49a23 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)); -- 2.1.0

On 01/05/2015 12:49 PM, Nehal J Wani wrote:
Lack of a lease (whether mac is given or not) is a normal expected scenario. There is no need to raise an error.
Signed-off-by: Nehal J Wani <nehaljw.kkd1@gmail.com> --- src/network/bridge_driver.c | 6 ------ 1 file changed, 6 deletions(-)
Since it was introduced by your own commit id 'ba5139821' and a recent query here had Dan's blessing: http://www.redhat.com/archives/libvir-list/2015-January/msg00055.html ACK - although perhaps it would be nice to put the information from the above linked query in the commit message in order to at least provide a bit more context as to why it's being removed. I'd say cut-n-paste the text after "In my opinion...". John
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 29222d0..6a49a23 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));

On 01/05/2015 12:16 PM, John Ferlan wrote:
On 01/05/2015 12:49 PM, Nehal J Wani wrote:
Lack of a lease (whether mac is given or not) is a normal expected scenario. There is no need to raise an error.
Signed-off-by: Nehal J Wani <nehaljw.kkd1@gmail.com> --- src/network/bridge_driver.c | 6 ------ 1 file changed, 6 deletions(-)
Since it was introduced by your own commit id 'ba5139821' and a recent query here had Dan's blessing:
http://www.redhat.com/archives/libvir-list/2015-January/msg00055.html
ACK - although perhaps it would be nice to put the information from the above linked query in the commit message in order to at least provide a bit more context as to why it's being removed. I'd say cut-n-paste the text after "In my opinion...".
I tweaked the commit message and pushed. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (3)
-
Eric Blake
-
John Ferlan
-
Nehal J Wani