OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hmp: Add option to info qtree to omit details

Browse Source 
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>
Reviewed-by: Dr. David Alan Gilbert <dave@treblig.org>
Message-ID: <20240307183812.0105D4E6004@zero.eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
BALATON Zoltan 2024-03-01 19:01:10 +01:00 committed by Philippe Mathieu-Daudé
parent 965bc08310
commit 46e23b2e42
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hmp-commands-info.hx
View File

@ -540,9 +540,9 @@ ERST
{ {
.name = "qtree", .name = "qtree",
.args_type = "", .args_type = "brief:-b",
.params = "", .params = "[-b]",
.help = "show device tree", .help = "show device tree (-b: brief, omit properties)",
.cmd = hmp_info_qtree, .cmd = hmp_info_qtree,
}, },

27
system/qdev-monitor.c
View File

@ -744,7 +744,6 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
} }
#define qdev_printf(fmt, ...) monitor_printf(mon, "%*s" fmt, indent, "", ## __VA_ARGS__) #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, static void qdev_print_props(Monitor *mon, DeviceState *dev, Property *props,
int indent) 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) static void qdev_print(Monitor *mon, DeviceState *dev, int indent)
{ {
ObjectClass *class; ObjectClass *class;
BusState *child;
NamedGPIOList *ngl; NamedGPIOList *ngl;
NamedClockList *ncl; 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) { QLIST_FOREACH(ngl, &dev->gpios, node) {
if (ngl->num_in) { if (ngl->num_in) {
qdev_printf("gpio-in \"%s\" %d\n", ngl->name ? ngl->name : "", 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); class = object_class_get_parent(class);
} while (class != object_class_by_name(TYPE_DEVICE)); } while (class != object_class_by_name(TYPE_DEVICE));
bus_print_dev(dev->parent_bus, mon, dev, indent); 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; BusChild *kid;
@ -827,16 +819,27 @@ static void qbus_print(Monitor *mon, BusState *bus, int indent)
indent += 2; indent += 2;
qdev_printf("type %s\n", object_get_typename(OBJECT(bus))); qdev_printf("type %s\n", object_get_typename(OBJECT(bus)));
QTAILQ_FOREACH(kid, &bus->children, sibling) { QTAILQ_FOREACH(kid, &bus->children, sibling) {
BusState *child_bus;
DeviceState *dev = kid->child; 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 #undef qdev_printf
void hmp_info_qtree(Monitor *mon, const QDict *qdict) void hmp_info_qtree(Monitor *mon, const QDict *qdict)
{ {
if (sysbus_get_default()) bool details = !qdict_get_try_bool(qdict, "brief", false);
qbus_print(mon, sysbus_get_default(), 0);
if (sysbus_get_default()) {
qbus_print(mon, sysbus_get_default(), 0, details);
}
} }
void hmp_info_qdm(Monitor *mon, const QDict *qdict) void hmp_info_qdm(Monitor *mon, const QDict *qdict)