From: Luiz Capitulino <lcapitulino@redhat.com>
Date: Wed, 20 Jan 2010 12:37:59 +0000 (-0200)
Subject: QMP: Fix asynchronous events delivery
X-Git-Tag: v0.12.3~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3bf9367f2de89e237d75eda2c3c861b3a400ec0;p=thirdparty%2Fqemu.git

QMP: Fix asynchronous events delivery

Commit f039a563f200beee80cc10fd70b21ea396979dab introduces
a regression as monitor_protocol_event() will return in
the first user Monitor it finds in the QLIST_FOREACH()
loop.

The right thing to do is to only delivery an asynchronous
event if the 'mon' is a QMP Monitor.

The aforementioned commit was an early version, if it was
applied to stable (it should) this one has to be applied
there too.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 23fabed13645fdf66473e458f318baa63be56b22)
---

diff --git a/monitor.c b/monitor.c
index bd4ee022d00..17e59f58671 100644
--- a/monitor.c
+++ b/monitor.c
@@ -368,10 +368,9 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
     }
 
     QLIST_FOREACH(mon, &mon_list, entry) {
-        if (!monitor_ctrl_mode(mon))
-            return;
-
-        monitor_json_emitter(mon, QOBJECT(qmp));
+        if (monitor_ctrl_mode(mon)) {
+            monitor_json_emitter(mon, QOBJECT(qmp));
+        }
     }
     QDECREF(qmp);
 }