virterror: Misleading error message when name is missing

[forwarding this here from RH bug #796732]

When creating a network (virsh net-create) with an erroneous XML
containing an empty <name> element, the error message is misleading:

error: Failed to create network from foo.xml
error: missing domain name information

It took me a bit of time to figure out that it was the *network* name
that was missing (I generate this xml and didn't look at it, first).

I realized that the same message is used for missing name when creating
a domain, network, or device node.

diff --git a/AUTHORS b/AUTHORS
index 1769e8abed475622d35efa3e9dbadb8a468fa503..32d5173e900148860ecf1940dba78eea2a2c9007 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -222,6 +222,7 @@ Patches have also been contributed by:
   Kyle Mestery         <kmestery@cisco.com>
   Lincoln Myers        <lincoln_myers@yahoo.com>
   Peter Robinson       <pbrobinson@gmail.com>
+  Benjamin Cama        <benoar@dolka.fr>
 
   [....send patches to get your name here....]
 

diff --git a/src/util/virterror.c b/src/util/virterror.c
index de6018527d3884c6e2823acfb790c15cbc46c540..48c61a2e1280e6ba65e277a3a21e6e51da875e3f 100644 (file)
--- a/src/util/virterror.c
+++ b/src/util/virterror.c
@@ -880,9 +880,9 @@ virErrorMsg(virErrorNumber error, const char *info)
             break;
         case VIR_ERR_NO_NAME:
             if (info == NULL)
-                errmsg = _("missing domain name information");
+                errmsg = _("missing name information");
             else
-                errmsg = _("missing domain name information in %s");
+                errmsg = _("missing name information in %s");
             break;
         case VIR_ERR_NO_OS:
             if (info == NULL)