Commit f039a563 authored by Adam Litke's avatar Adam Litke Committed by Anthony Liguori
Browse files

QMP: Emit asynchronous events on all QMP monitors 



When using a control/QMP monitor in tandem with a regular monitor, asynchronous
messages can get lost depending on the order of the QEMU program arguments.
QEMU events issued by monitor_protocol_event() always go to cur_mon.  If the
user monitor was specified on the command line first (or it has ,default), the
message will be directed to the user monitor (not the QMP monitor).
Additionally, only one QMP session is currently able to receive async messages.

To avoid this confusion, scan through the list of monitors and emit the message
on each QMP monitor.

Signed-off-by: default avatarAdam Litke <agl@us.ibm.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent beb6f0de

monitor.c

+7 −5
Original line number Diff line number Diff line
@@ -334,13 +334,10 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) 
{

    QDict *qmp;

    const char *event_name;

    Monitor *mon = cur_mon;

    Monitor *mon;



    assert(event < QEVENT_MAX);



    if (!monitor_ctrl_mode(mon))

        return;



    switch (event) {

        case QEVENT_DEBUG:

            event_name = "DEBUG";
@@ -379,7 +376,12 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) 
        qdict_put_obj(qmp, "data", data);

    }



    QLIST_FOREACH(mon, &mon_list, entry) {

        if (!monitor_ctrl_mode(mon))

            return;



        monitor_json_emitter(mon, QOBJECT(qmp));

    }

    QDECREF(qmp);

}