[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 12/20] monitor: Inline monitor_has_error() into i
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 12/20] monitor: Inline monitor_has_error() into its only caller |
Date: |
Tue, 26 May 2015 17:20:47 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
monitor.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/monitor.c b/monitor.c
index 5a13cd2..f7e8fdf 100644
--- a/monitor.c
+++ b/monitor.c
@@ -377,11 +377,6 @@ static int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream,
return 0;
}
-static inline int monitor_has_error(const Monitor *mon)
-{
- return mon->error != NULL;
-}
-
static void monitor_json_emitter(Monitor *mon, const QObject *data)
{
QString *json;
@@ -5029,7 +5024,7 @@ static void handle_qmp_command(JSONMessageParser *parser,
QList *tokens)
if (cmd->mhandler.cmd_new(mon, args, &data)) {
/* Command failed... */
- if (!monitor_has_error(mon)) {
+ if (!mon->error) {
/* ... without setting an error, so make one up */
qerror_report(QERR_UNDEFINED_ERROR);
}
--
1.9.3
- [Qemu-devel] [PATCH v2 01/20] monitor: Drop broken, unused asynchronous command interface, (continued)
- [Qemu-devel] [PATCH v2 01/20] monitor: Drop broken, unused asynchronous command interface, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 04/20] monitor: Convert client_migrate_info to QAPI, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 03/20] monitor: Improve and document client_migrate_info protocol error, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 05/20] monitor: Use traditional command interface for HMP drive_del, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 14/20] monitor: Rename handle_user_command() to handle_hmp_command(), Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 08/20] monitor: Drop unused "new" HMP command interface, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 10/20] monitor: Propagate errors through qmp_check_input_obj(), Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 12/20] monitor: Inline monitor_has_error() into its only caller,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 13/20] monitor: Limit QError use to command handlers, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 06/20] monitor: Use traditional command interface for HMP device_add, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 09/20] monitor: Propagate errors through qmp_check_client_args(), Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 11/20] monitor: Wean monitor_protocol_emitter() off mon->error, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 17/20] monitor: Drop do_qmp_capabilities()'s superfluous QMP check, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 19/20] monitor: Rename monitor_ctrl_mode() to monitor_is_qmp(), Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 07/20] monitor: Use trad. command interface for HMP pcie_aer_inject_error, Markus Armbruster, 2015/05/26