commit 70ea0c58991ae44b5a1e67d9c189d79029168cb1
author Markus Armbruster <armbru@redhat.com> Fri Mar 06 10:47:08 2015 +0100
committer Markus Armbruster <armbru@redhat.com> Tue Jun 02 09:59:14 2015 +0200
tree 6b6845e587e7dc6aefde3dda3b3d5606feeb3805
parent 4086182fcd9b106345b5cc535d78bcc6d13a7683

monitor: Wean monitor_protocol_emitter() off mon->error

Move mon->error handling to its caller handle_qmp_command().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>

monitor.c

diff --git a/monitor.c b/monitor.c
index d336b8f..56564d5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -407,13 +407,14 @@
     return qobject_to_qdict(obj);
 }
 
-static void monitor_protocol_emitter(Monitor *mon, QObject *data)
+static void monitor_protocol_emitter(Monitor *mon, QObject *data,
+                                     QError *err)
 {
     QDict *qmp;
 
     trace_monitor_protocol_emitter(mon);
 
-    if (!monitor_has_error(mon)) {
+    if (!err) {
         /* success response */
         qmp = qdict_new();
         if (data) {
@@ -425,9 +426,7 @@
         }
     } else {
         /* error response */
-        qmp = build_qmp_error_dict(mon->error);
-        QDECREF(mon->error);
-        mon->error = NULL;
+        qmp = build_qmp_error_dict(err);
     }
 
     if (mon->mc->id) {
@@ -5039,8 +5038,10 @@
     }
 
 err_out:
-    monitor_protocol_emitter(mon, data);
+    monitor_protocol_emitter(mon, data, mon->error);
     qobject_decref(data);
+    QDECREF(mon->error);
+    mon->error = NULL;
     QDECREF(input);
     QDECREF(args);
 }