summaryrefslogtreecommitdiff
path: root/qerror.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2009-12-07 21:37:16 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-07 16:36:50 -0600
commit143d288cba95329e30c1c8c3403a53b35629ee72 (patch)
tree8c0191a187421586ffae39a1029ab9dff7c382f6 /qerror.c
parent13a2ccc46f66ffb0a6434e3b1319bf0ebd81ac54 (diff)
downloadqemu-143d288cba95329e30c1c8c3403a53b35629ee72.tar.gz
QMP: add human-readable description to error response
Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 77e595e7c613c495714d04ce63fb9bce263c29ae)
Diffstat (limited to 'qerror.c')
-rw-r--r--qerror.c21
1 files changed, 16 insertions, 5 deletions
diff --git a/qerror.c b/qerror.c
index 8ffe4f673b..5f8fc5dec5 100644
--- a/qerror.c
+++ b/qerror.c
@@ -283,13 +283,11 @@ static const char *append_field(QString *outstr, const QError *qerror,
}
/**
- * qerror_print(): Print QError data
+ * qerror_human(): Format QError data into human-readable string.
*
- * This function will print the member 'desc' of the specified QError object,
- * it uses qemu_error() for this, so that the output is routed to the right
- * place (ie. stderr or Monitor's device).
+ * Formats according to member 'desc' of the specified QError object.
*/
-void qerror_print(const QError *qerror)
+QString *qerror_human(const QError *qerror)
{
const char *p;
QString *qstring;
@@ -309,6 +307,19 @@ void qerror_print(const QError *qerror)
}
}
+ return qstring;
+}
+
+/**
+ * qerror_print(): Print QError data
+ *
+ * This function will print the member 'desc' of the specified QError object,
+ * it uses qemu_error() for this, so that the output is routed to the right
+ * place (ie. stderr or Monitor's device).
+ */
+void qerror_print(const QError *qerror)
+{
+ QString *qstring = qerror_human(qerror);
qemu_error("%s\n", qstring_get_str(qstring));
QDECREF(qstring);
}