Patchwork QMP: Save default control monitor for emitting async events

login
register
mail settings
Submitter Adam Litke
Date Jan. 14, 2010, 9:20 p.m.
Message ID <1263504010.2847.27.camel@aglitke>
Download mbox | patch
Permalink /patch/42927/
State New
Headers show

Comments

Adam Litke - Jan. 14, 2010, 9:20 p.m.
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).

One solution is to save the default QMP session in another monitor pointer (ala
cur_mon) and always direct asynchronous events to that monitor...

Signed-off-by: Adam Litke <agl@us.ibm.com>
Luiz Capitulino - Jan. 15, 2010, 1:38 p.m.
On Thu, 14 Jan 2010 15:20:10 -0600
Adam Litke <agl@us.ibm.com> wrote:

> 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).

 I think we have two problems here:

1. Async messages are only delivered for the default Monitor, so if the QMP
Monitor is not the default one it won't get them (not a bug if well
documented, but it's annoying)

2. On a multiple QMP Monitor setup, only one of them will get async messages

 This patch fixes 1. but the best fix would be to solve both problems,
as QMP Monitors have to be equally capable IMO.

 There's an array with all Monitors IIRC, maybe we could loop through it
and delivery the message to each QMP ones of them?

> One solution is to save the default QMP session in another monitor pointer (ala
> cur_mon) and always direct asynchronous events to that monitor...
> 
> Signed-off-by: Adam Litke <agl@us.ibm.com>
> 
> diff --git a/monitor.c b/monitor.c
> index 134ed15..794f6ba 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -128,6 +128,7 @@ static const mon_cmd_t mon_cmds[];
>  static const mon_cmd_t info_cmds[];
>  
>  Monitor *cur_mon = NULL;
> +Monitor *cur_mon_control = NULL;
>  
>  static void monitor_command_cb(Monitor *mon, const char *cmdline,
>                                 void *opaque);
> @@ -334,11 +335,11 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
>  {
>      QDict *qmp;
>      const char *event_name;
> -    Monitor *mon = cur_mon;
> +    Monitor *mon = cur_mon_control;
>  
>      assert(event < QEVENT_MAX);
>  
> -    if (!monitor_ctrl_mode(mon))
> +    if (!mon)
>          return;
>  
>      switch (event) {
> @@ -4283,6 +4284,9 @@ void monitor_init(CharDriverState *chr, int flags)
>      QLIST_INSERT_HEAD(&mon_list, mon, entry);
>      if (!cur_mon || (flags & MONITOR_IS_DEFAULT))
>          cur_mon = mon;
> +    if (!cur_mon_control || (flags & MONITOR_IS_DEFAULT))
> +        if (flags & MONITOR_USE_CONTROL)
> +            cur_mon_control = mon;
>  }
>  
>  static void bdrv_password_cb(Monitor *mon, const char *password, void *opaque)
> diff --git a/monitor.h b/monitor.h
> index 556239a..a343589 100644
> --- a/monitor.h
> +++ b/monitor.h
> @@ -7,6 +7,7 @@
>  #include "block.h"
>  
>  extern Monitor *cur_mon;
> +extern Monitor *cur_mon_control;
>  
>  /* flags for monitor_init */
>  #define MONITOR_IS_DEFAULT    0x01
> diff --git a/qemu-tool.c b/qemu-tool.c
> index 18b48af..cfe03d6 100644
> --- a/qemu-tool.c
> +++ b/qemu-tool.c
> @@ -34,6 +34,7 @@ void qemu_service_io(void)
>  }
>  
>  Monitor *cur_mon;
> +Monitor *cur_mon_control;
>  
>  void monitor_printf(Monitor *mon, const char *fmt, ...)
>  {
> 
>
Adam Litke - Jan. 15, 2010, 1:48 p.m.
On Fri, 2010-01-15 at 11:38 -0200, Luiz Capitulino wrote:
> On Thu, 14 Jan 2010 15:20:10 -0600
> Adam Litke <agl@us.ibm.com> wrote:
> 
> > 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).
> 
>  I think we have two problems here:
> 
> 1. Async messages are only delivered for the default Monitor, so if the QMP
> Monitor is not the default one it won't get them (not a bug if well
> documented, but it's annoying)
> 
> 2. On a multiple QMP Monitor setup, only one of them will get async messages
> 
>  This patch fixes 1. but the best fix would be to solve both problems,
> as QMP Monitors have to be equally capable IMO.
> 
>  There's an array with all Monitors IIRC, maybe we could loop through it
> and delivery the message to each QMP ones of them?

Sure.  This was the other way I was considering.  I'll spin up a patch
and we can see how it looks.

Patch

diff --git a/monitor.c b/monitor.c
index 134ed15..794f6ba 100644
--- a/monitor.c
+++ b/monitor.c
@@ -128,6 +128,7 @@  static const mon_cmd_t mon_cmds[];
 static const mon_cmd_t info_cmds[];
 
 Monitor *cur_mon = NULL;
+Monitor *cur_mon_control = NULL;
 
 static void monitor_command_cb(Monitor *mon, const char *cmdline,
                                void *opaque);
@@ -334,11 +335,11 @@  void monitor_protocol_event(MonitorEvent event, QObject *data)
 {
     QDict *qmp;
     const char *event_name;
-    Monitor *mon = cur_mon;
+    Monitor *mon = cur_mon_control;
 
     assert(event < QEVENT_MAX);
 
-    if (!monitor_ctrl_mode(mon))
+    if (!mon)
         return;
 
     switch (event) {
@@ -4283,6 +4284,9 @@  void monitor_init(CharDriverState *chr, int flags)
     QLIST_INSERT_HEAD(&mon_list, mon, entry);
     if (!cur_mon || (flags & MONITOR_IS_DEFAULT))
         cur_mon = mon;
+    if (!cur_mon_control || (flags & MONITOR_IS_DEFAULT))
+        if (flags & MONITOR_USE_CONTROL)
+            cur_mon_control = mon;
 }
 
 static void bdrv_password_cb(Monitor *mon, const char *password, void *opaque)
diff --git a/monitor.h b/monitor.h
index 556239a..a343589 100644
--- a/monitor.h
+++ b/monitor.h
@@ -7,6 +7,7 @@ 
 #include "block.h"
 
 extern Monitor *cur_mon;
+extern Monitor *cur_mon_control;
 
 /* flags for monitor_init */
 #define MONITOR_IS_DEFAULT    0x01
diff --git a/qemu-tool.c b/qemu-tool.c
index 18b48af..cfe03d6 100644
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -34,6 +34,7 @@  void qemu_service_io(void)
 }
 
 Monitor *cur_mon;
+Monitor *cur_mon_control;
 
 void monitor_printf(Monitor *mon, const char *fmt, ...)
 {