Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2018-09-01' into staging

[mirror_qemu.git] / monitor.c

diff --git a/monitor.c b/monitor.c
index cf3b629cf7be489bfb68e13596dcf55d6d689bd0..3b90c9eb5fc16417ce49851771156061bd24b57f 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -589,7 +589,7 @@ monitor_qapi_event_queue_no_reenter(QAPIEvent event, QDict *qdict)
 }
 
 static void
-monitor_qapi_event_queue(QAPIEvent event, QDict *qdict, Error **errp)
+monitor_qapi_event_queue(QAPIEvent event, QDict *qdict)
 {
     /*
      * monitor_qapi_event_queue_no_reenter() is not reentrant: it
@@ -4215,8 +4215,7 @@ static void handle_qmp_command(void *opaque, QObject *req, Error *err)
              * that command was dropped.
              */
             qapi_event_send_command_dropped(id,
-                                            COMMAND_DROP_REASON_QUEUE_FULL,
-                                            &error_abort);
+                                            COMMAND_DROP_REASON_QUEUE_FULL);
             qmp_request_free(req_obj);
             return;
         }