From: Markus Armbruster <armbru@redhat.com>
Date: Fri, 6 Mar 2015 18:11:13 +0000 (+0100)
Subject: monitor: Inline monitor_has_error() into its only caller
X-Git-Tag: v2.4.0-rc0~103^2~8
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=452e0300a3521f13b6c4ba0b99a8cea3a29209f1;p=qemu-xen-unstable.git

monitor: Inline monitor_has_error() into its only caller

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

diff --git a/monitor.c b/monitor.c
index 56564d5bef..91f8a4e5d7 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);
         }