]> git.proxmox.com Git - mirror_qemu.git/commitdiff
monitor: Inline monitor_has_error() into its only caller
authorMarkus Armbruster <armbru@redhat.com>
Fri, 6 Mar 2015 18:11:13 +0000 (19:11 +0100)
committerMarkus Armbruster <armbru@redhat.com>
Tue, 2 Jun 2015 07:59:14 +0000 (09:59 +0200)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
monitor.c

index 56564d5bef34cdc5af26c50a82afcc7ea5b8651e..91f8a4e5d7f4c1297b409e311312ab3ed59e5b4e 100644 (file)
--- 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);
         }