Patchwork [10/20] QMP: do_info() checks

login
register
mail settings
Submitter Luiz Capitulino
Date Nov. 27, 2009, 12:59 a.m.
Message ID <1259283550-3597-11-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/39601/
State New
Headers show

Comments

Luiz Capitulino - Nov. 27, 2009, 12:59 a.m.
This commit adds specific QMP checks to do_info(), so that
it behaves as expected in QMP mode.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

Patch

diff --git a/monitor.c b/monitor.c
index ffb5ed2..de56201 100644
--- a/monitor.c
+++ b/monitor.c
@@ -367,16 +367,23 @@  static void do_info(Monitor *mon, const QDict *qdict, QObject **ret_data)
     const mon_cmd_t *cmd;
     const char *item = qdict_get_try_str(qdict, "item");
 
-    if (!item)
+    if (!item) {
+        assert(monitor_ctrl_mode(mon) == 0);
         goto help;
+    }
 
     for (cmd = info_cmds; cmd->name != NULL; cmd++) {
         if (compare_cmd(item, cmd->name))
             break;
     }
 
-    if (cmd->name == NULL)
+    if (cmd->name == NULL) {
+        if (monitor_ctrl_mode(mon)) {
+            qemu_error_new(QERR_COMMAND_NOT_FOUND, item);
+            return;
+        }
         goto help;
+    }
 
     if (monitor_handler_ported(cmd)) {
         cmd->mhandler.info_new(mon, ret_data);
@@ -390,7 +397,12 @@  static void do_info(Monitor *mon, const QDict *qdict, QObject **ret_data)
                 cmd->user_print(mon, *ret_data);
         }
     } else {
-        cmd->mhandler.info(mon);
+        if (monitor_ctrl_mode(mon)) {
+            /* handler not converted yet */
+            qemu_error_new(QERR_COMMAND_NOT_FOUND, item);
+        } else {
+            cmd->mhandler.info(mon);
+        }
     }
 
     return;