diff mbox series

hmp: Add option to info qtree to omit details

Message ID 20240301181229.332754E602B@zero.eik.bme.hu (mailing list archive)
State New, archived
Headers show
Series hmp: Add option to info qtree to omit details | expand

Commit Message

BALATON Zoltan March 1, 2024, 6:05 p.m. UTC 
The output of info qtree monitor command is very long. Add an option
to print a brief overview omitting all the details.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
 hmp-commands-info.hx  |  6 +++---
 system/qdev-monitor.c | 24 +++++++++++++-----------
 2 files changed, 16 insertions(+), 14 deletions(-)

Comments

Dr. David Alan Gilbert March 7, 2024, 3:08 p.m. UTC | #1 
* BALATON Zoltan (balaton@eik.bme.hu) wrote:
> The output of info qtree monitor command is very long. Add an option
> to print a brief overview omitting all the details.
> 
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>

Seems OK to me (I'm not sure I'd have both 'brief' and 'detailed',
but rather stick to one or the other as variable names); still:

Reviewed-by: Dr. David Alan Gilbert <dave@treblig.org>

> ---
>  hmp-commands-info.hx  |  6 +++---
>  system/qdev-monitor.c | 24 +++++++++++++-----------
>  2 files changed, 16 insertions(+), 14 deletions(-)
> 
> diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
> index da120f82a3..ad1b1306e3 100644
> --- a/hmp-commands-info.hx
> +++ b/hmp-commands-info.hx
> @@ -540,9 +540,9 @@ ERST
>  
>      {
>          .name       = "qtree",
> -        .args_type  = "",
> -        .params     = "",
> -        .help       = "show device tree",
> +        .args_type  = "brief:-b",
> +        .params     = "[-b]",
> +        .help       = "show device tree (-b: brief, omit properties)",
>          .cmd        = hmp_info_qtree,
>      },
>  
> diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
> index a13db763e5..d5cef36800 100644
> --- a/system/qdev-monitor.c
> +++ b/system/qdev-monitor.c
> @@ -744,7 +744,6 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
>  }
>  
>  #define qdev_printf(fmt, ...) monitor_printf(mon, "%*s" fmt, indent, "", ## __VA_ARGS__)
> -static void qbus_print(Monitor *mon, BusState *bus, int indent);
>  
>  static void qdev_print_props(Monitor *mon, DeviceState *dev, Property *props,
>                               int indent)
> @@ -784,13 +783,9 @@ static void bus_print_dev(BusState *bus, Monitor *mon, DeviceState *dev, int ind
>  static void qdev_print(Monitor *mon, DeviceState *dev, int indent)
>  {
>      ObjectClass *class;
> -    BusState *child;
>      NamedGPIOList *ngl;
>      NamedClockList *ncl;
>  
> -    qdev_printf("dev: %s, id \"%s\"\n", object_get_typename(OBJECT(dev)),
> -                dev->id ? dev->id : "");
> -    indent += 2;
>      QLIST_FOREACH(ngl, &dev->gpios, node) {
>          if (ngl->num_in) {
>              qdev_printf("gpio-in \"%s\" %d\n", ngl->name ? ngl->name : "",
> @@ -814,12 +809,9 @@ static void qdev_print(Monitor *mon, DeviceState *dev, int indent)
>          class = object_class_get_parent(class);
>      } while (class != object_class_by_name(TYPE_DEVICE));
>      bus_print_dev(dev->parent_bus, mon, dev, indent);
> -    QLIST_FOREACH(child, &dev->child_bus, sibling) {
> -        qbus_print(mon, child, indent);
> -    }
>  }
>  
> -static void qbus_print(Monitor *mon, BusState *bus, int indent)
> +static void qbus_print(Monitor *mon, BusState *bus, int indent, bool details)
>  {
>      BusChild *kid;
>  
> @@ -827,16 +819,26 @@ static void qbus_print(Monitor *mon, BusState *bus, int indent)
>      indent += 2;
>      qdev_printf("type %s\n", object_get_typename(OBJECT(bus)));
>      QTAILQ_FOREACH(kid, &bus->children, sibling) {
> +        BusState *child_bus;
>          DeviceState *dev = kid->child;
> -        qdev_print(mon, dev, indent);
> +        qdev_printf("dev: %s, id \"%s\"\n", object_get_typename(OBJECT(dev)),
> +                    dev->id ? dev->id : "");
> +        if (details) {
> +            qdev_print(mon, dev, indent + 2);
> +        }
> +        QLIST_FOREACH(child_bus, &dev->child_bus, sibling) {
> +            qbus_print(mon, child_bus, indent + 2, details);
> +        }
>      }
>  }
>  #undef qdev_printf
>  
>  void hmp_info_qtree(Monitor *mon, const QDict *qdict)
>  {
> +    bool brief = qdict_get_try_bool(qdict, "brief", false);
> +
>      if (sysbus_get_default())
> -        qbus_print(mon, sysbus_get_default(), 0);
> +        qbus_print(mon, sysbus_get_default(), 0, !brief);
>  }
>  
>  void hmp_info_qdm(Monitor *mon, const QDict *qdict)
> -- 
> 2.30.9
>
diff mbox series

Patch

diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
index da120f82a3..ad1b1306e3 100644
--- a/hmp-commands-info.hx
+++ b/hmp-commands-info.hx
@@ -540,9 +540,9 @@  ERST
 
     {
         .name       = "qtree",
-        .args_type  = "",
-        .params     = "",
-        .help       = "show device tree",
+        .args_type  = "brief:-b",
+        .params     = "[-b]",
+        .help       = "show device tree (-b: brief, omit properties)",
         .cmd        = hmp_info_qtree,
     },
 
diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
index a13db763e5..d5cef36800 100644
--- a/system/qdev-monitor.c
+++ b/system/qdev-monitor.c
@@ -744,7 +744,6 @@  DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
 }
 
 #define qdev_printf(fmt, ...) monitor_printf(mon, "%*s" fmt, indent, "", ## __VA_ARGS__)
-static void qbus_print(Monitor *mon, BusState *bus, int indent);
 
 static void qdev_print_props(Monitor *mon, DeviceState *dev, Property *props,
                              int indent)
@@ -784,13 +783,9 @@  static void bus_print_dev(BusState *bus, Monitor *mon, DeviceState *dev, int ind
 static void qdev_print(Monitor *mon, DeviceState *dev, int indent)
 {
     ObjectClass *class;
-    BusState *child;
     NamedGPIOList *ngl;
     NamedClockList *ncl;
 
-    qdev_printf("dev: %s, id \"%s\"\n", object_get_typename(OBJECT(dev)),
-                dev->id ? dev->id : "");
-    indent += 2;
     QLIST_FOREACH(ngl, &dev->gpios, node) {
         if (ngl->num_in) {
             qdev_printf("gpio-in \"%s\" %d\n", ngl->name ? ngl->name : "",
@@ -814,12 +809,9 @@  static void qdev_print(Monitor *mon, DeviceState *dev, int indent)
         class = object_class_get_parent(class);
     } while (class != object_class_by_name(TYPE_DEVICE));
     bus_print_dev(dev->parent_bus, mon, dev, indent);
-    QLIST_FOREACH(child, &dev->child_bus, sibling) {
-        qbus_print(mon, child, indent);
-    }
 }
 
-static void qbus_print(Monitor *mon, BusState *bus, int indent)
+static void qbus_print(Monitor *mon, BusState *bus, int indent, bool details)
 {
     BusChild *kid;
 
@@ -827,16 +819,26 @@  static void qbus_print(Monitor *mon, BusState *bus, int indent)
     indent += 2;
     qdev_printf("type %s\n", object_get_typename(OBJECT(bus)));
     QTAILQ_FOREACH(kid, &bus->children, sibling) {
+        BusState *child_bus;
         DeviceState *dev = kid->child;
-        qdev_print(mon, dev, indent);
+        qdev_printf("dev: %s, id \"%s\"\n", object_get_typename(OBJECT(dev)),
+                    dev->id ? dev->id : "");
+        if (details) {
+            qdev_print(mon, dev, indent + 2);
+        }
+        QLIST_FOREACH(child_bus, &dev->child_bus, sibling) {
+            qbus_print(mon, child_bus, indent + 2, details);
+        }
     }
 }
 #undef qdev_printf
 
 void hmp_info_qtree(Monitor *mon, const QDict *qdict)
 {
+    bool brief = qdict_get_try_bool(qdict, "brief", false);
+
     if (sysbus_get_default())
-        qbus_print(mon, sysbus_get_default(), 0);
+        qbus_print(mon, sysbus_get_default(), 0, !brief);
 }
 
 void hmp_info_qdm(Monitor *mon, const QDict *qdict)