[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/20] monitor: Wean monitor_protocol_emitter() off
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 11/20] monitor: Wean monitor_protocol_emitter() off mon->error |
Date: |
Fri, 22 May 2015 13:36:16 +0200 |
Move mon->error handling to its caller handle_qmp_command().
Signed-off-by: Markus Armbruster <address@hidden>
---
monitor.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/monitor.c b/monitor.c
index 1d7ad0a..c732203 100644
--- a/monitor.c
+++ b/monitor.c
@@ -407,13 +407,14 @@ static QDict *build_qmp_error_dict(const QError *err)
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 @@ static void monitor_protocol_emitter(Monitor *mon, QObject
*data)
}
} 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 @@ static void handle_qmp_command(JSONMessageParser
*parser, QList *tokens)
}
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);
}
--
1.9.3
- Re: [Qemu-devel] [PATCH 18/20] monitor: Turn int command_mode into bool in_command_mode, (continued)
- [Qemu-devel] [PATCH 19/20] monitor: Rename monitor_ctrl_mode() to monitor_is_qmp(), Markus Armbruster, 2015/05/22
- [Qemu-devel] [PATCH 13/20] monitor: Limit QError use to command handlers, Markus Armbruster, 2015/05/22
- [Qemu-devel] [PATCH 16/20] monitor: Unbox Monitor member mc and rename to qmp, Markus Armbruster, 2015/05/22
- [Qemu-devel] [PATCH 11/20] monitor: Wean monitor_protocol_emitter() off mon->error,
Markus Armbruster <=
- [Qemu-devel] [PATCH 15/20] monitor: Rename monitor_control_read(), monitor_control_event(), Markus Armbruster, 2015/05/22
- [Qemu-devel] [PATCH 20/20] monitor: Change return type of monitor_cur_is_qmp() to bool, Markus Armbruster, 2015/05/22