Patchwork [RFC,11/11] Change the monitor to use the new do_info_qtree.

login
register
mail settings
Submitter Nathan Baum
Date Dec. 26, 2009, 9:11 p.m.
Message ID <1261861899-1984-12-git-send-email-nathan@parenthephobia.org.uk>
Download mbox | patch
Permalink /patch/41823/
State New
Headers show

Comments

Nathan Baum - Dec. 26, 2009, 9:11 p.m.
Signed-off-by: Nathan Baum <nathan@parenthephobia.org.uk>
---
 hw/qdev.c |    9 ++++++++-
 hw/qdev.h |    3 ++-
 monitor.c |    3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

Patch

diff --git a/hw/qdev.c b/hw/qdev.c
index f5d68c6..d9d3778 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -727,6 +727,12 @@  static void do_info_qbus(Monitor *mon, BusState *bus, QObject **ret_data)
     *ret_data = (QObject *) qdict;
 }
 
+void do_info_qtree(Monitor *mon, QObject **ret_data)
+{
+    if (main_system_bus)
+        do_info_qbus(mon, main_system_bus, ret_data);
+}
+
 #define qdev_printf(fmt, ...) monitor_printf(mon, "%*s" fmt, indent, "", ## __VA_ARGS__)
 static void qbus_print(Monitor *mon, BusState *bus, int indent);
 
@@ -780,8 +786,9 @@  static void qbus_print(Monitor *mon, BusState *bus, int indent)
 }
 #undef qdev_printf
 
-void do_info_qtree(Monitor *mon)
+void do_info_qtree_print(Monitor *mon, const QObject *data)
 {
+    // TODO: Display qtree from the data!
     if (main_system_bus)
         qbus_print(mon, main_system_bus, 0);
 }
diff --git a/hw/qdev.h b/hw/qdev.h
index 93467a5..aad4f75 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -168,7 +168,8 @@  void qbus_free(BusState *bus);
 
 /*** monitor commands ***/
 
-void do_info_qtree(Monitor *mon);
+void do_info_qtree(Monitor *mon, QObject **ret_data);
+void do_info_qtree_print(Monitor *mon, const QObject *data);
 void do_info_qdm(Monitor *mon);
 void do_device_add(Monitor *mon, const QDict *qdict);
 void do_device_del(Monitor *mon, const QDict *qdict);
diff --git a/monitor.c b/monitor.c
index e6b5424..8d5b650 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2607,7 +2607,8 @@  static const mon_cmd_t info_cmds[] = {
         .args_type  = "",
         .params     = "",
         .help       = "show device tree",
-        .mhandler.info = do_info_qtree,
+        .user_print = do_info_qtree_print,
+        .mhandler.info_new = do_info_qtree,
     },
     {
         .name       = "qdm",