From: Luyao Huang <lhuang@redhat.com>
Date: Thu, 29 Oct 2015 09:47:33 +0000 (+0800)
Subject: util: set error if DAD is not finished
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d41a64a1948c88ccec5b4cff34fd04d3aae7a71e;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

util: set error if DAD is not finished

If DAD not finished in 5 seconds, user will get an
unknown error like this:

 # virsh net-start ipv6
 error: Failed to start network ipv6
 error: An error occurred, but the cause is unknown

Call virReportError to set an error.

Signed-off-by: Luyao Huang <lhuang@redhat.com>
---

diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 9789e930a..c8861e979 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -1398,7 +1398,13 @@ virNetDevWaitDadFinish(virSocketAddrPtr *addrs, size_t count)
         VIR_FREE(resp);
     }
     /* Check timeout. */
-    ret = dad ? -1 : 0;
+    if (dad) {
+        virReportError(VIR_ERR_SYSTEM_ERROR,
+                       _("Duplicate Address Detection "
+                         "not finished in %d seconds"), VIR_DAD_WAIT_TIMEOUT);
+    } else {
+        ret = 0;
+    }
 
  cleanup:
     VIR_FREE(resp);