[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/20] monitor: Inline monitor_has_error() into its
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 12/20] monitor: Inline monitor_has_error() into its only caller |
Date: |
Fri, 22 May 2015 13:36:17 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
---
monitor.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/monitor.c b/monitor.c
index c732203..71ca03f 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;
@@ -5031,7 +5026,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 00/20] monitor: Wean core off QError, and other cleanups, Markus Armbruster, 2015/05/22
- [Qemu-devel] [PATCH 03/20] monitor: Improve and document client_migrate_info protocol error, Markus Armbruster, 2015/05/22
- [Qemu-devel] [PATCH 08/20] monitor: Drop unused "new" HMP command interface, Markus Armbruster, 2015/05/22
- [Qemu-devel] [PATCH 10/20] monitor: Propagate errors through qmp_check_input_obj(), Markus Armbruster, 2015/05/22
- [Qemu-devel] [PATCH 12/20] monitor: Inline monitor_has_error() into its only caller,
Markus Armbruster <=
- [Qemu-devel] [PATCH 04/20] monitor: Convert client_migrate_info to QAPI, Markus Armbruster, 2015/05/22
- Re: [Qemu-devel] [PATCH 04/20] monitor: Convert client_migrate_info to QAPI, Eric Blake, 2015/05/22
- Re: [Qemu-devel] [PATCH 04/20] monitor: Convert client_migrate_info to QAPI, Markus Armbruster, 2015/05/26
- Re: [Qemu-devel] [PATCH 04/20] monitor: Convert client_migrate_info to QAPI, Gerd Hoffmann, 2015/05/26
- Re: [Qemu-devel] [PATCH 04/20] monitor: Convert client_migrate_info to QAPI, Daniel P. Berrange, 2015/05/26
- Re: [Qemu-devel] [PATCH 04/20] monitor: Convert client_migrate_info to QAPI, Markus Armbruster, 2015/05/26
- Re: [Qemu-devel] [PATCH 04/20] monitor: Convert client_migrate_info to QAPI, Gerd Hoffmann, 2015/05/26
- Re: [Qemu-devel] [PATCH 04/20] monitor: Convert client_migrate_info to QAPI, Markus Armbruster, 2015/05/26
[Qemu-devel] [PATCH 02/20] monitor: Clean up after previous commit, Markus Armbruster, 2015/05/22