From: Cole Robinson <crobinso@redhat.com>
Date: Sat, 3 May 2014 19:53:03 +0000 (-0400)
Subject: virdbus: Show method name in error message
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b51804535a75610a145f083bb57f16301f816b1a;p=libvirt.git

virdbus: Show method name in error message

If you trigger bug 1033369, we get the error message:

  error from service: Invalid argument

Which is a bit too generic to pinpoint what is actually failing. This
changes it to:

  error from service: CreateMachine: Invalid argument

Acked-by: Eric Blake <eblake@redhat.com>
---

diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index 03ec028dc9..31251fe106 100644
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -1408,7 +1408,8 @@ static int
 virDBusCall(DBusConnection *conn,
             DBusMessage *call,
             DBusMessage **replyout,
-            DBusError *error)
+            DBusError *error,
+            const char *member)
 {
     DBusMessage *reply = NULL;
     DBusError localerror;
@@ -1424,7 +1425,7 @@ virDBusCall(DBusConnection *conn,
         if (error)
             ret = 0;
         else {
-            virReportError(VIR_ERR_DBUS_SERVICE, "%s",
+            virReportError(VIR_ERR_DBUS_SERVICE, _("%s: %s"), member,
                 localerror.message ? localerror.message : _("unknown error"));
         }
         goto cleanup;
@@ -1502,7 +1503,7 @@ int virDBusCallMethod(DBusConnection *conn,
 
     ret = -1;
 
-    ret = virDBusCall(conn, call, replyout, error);
+    ret = virDBusCall(conn, call, replyout, error, member);
 
  cleanup:
     if (call)