]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
QMP: Fix asynchronous events delivery
authorLuiz Capitulino <lcapitulino@redhat.com>
Wed, 20 Jan 2010 12:37:59 +0000 (10:37 -0200)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 20 Jan 2010 14:53:24 +0000 (08:53 -0600)
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)

monitor.c

index bd4ee022d0073eb57117227667a2a06055ff0bdb..17e59f586710f3fddab820ab055a7e210285750e 100644 (file)
--- 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);
 }