memory: Make 'info mtree' not display disabled regions by default

author Philippe Mathieu-Daudé <philmd@redhat.com>

Fri, 29 May 2020 12:53:25 +0000 (14:53 +0200)

committer Paolo Bonzini <pbonzini@redhat.com>

Wed, 10 Jun 2020 16:10:49 +0000 (12:10 -0400)
author Philippe Mathieu-Daudé <philmd@redhat.com>
Fri, 29 May 2020 12:53:25 +0000 (14:53 +0200)
committer Paolo Bonzini <pbonzini@redhat.com>
Wed, 10 Jun 2020 16:10:49 +0000 (12:10 -0400)
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx

index ca5198438deccd2b9e9e8350fe913435c0ba34e0..30209e3903259f087c3997f4a3f59e75bf4f24aa 100644 (file)
--- a/hmp-commands-info.hx
+++ b/hmp-commands-info.hx
@@ -254,11 +254,12 @@ ERST
  
      {
          .name       = "mtree",
-        .args_type  = "flatview:-f,dispatch_tree:-d,owner:-o",
-        .params     = "[-f][-d][-o]",
+        .args_type  = "flatview:-f,dispatch_tree:-d,owner:-o,disabled:-D",
+        .params     = "[-f][-d][-o][-D]",
          .help       = "show memory tree (-f: dump flat view for address spaces;"
                        "-d: dump dispatch tree, valid with -f only);"
-                      "-o: dump region owners/parents",
+                      "-o: dump region owners/parents;"
+                      "-D: dump disabled regions",
          .cmd        = hmp_info_mtree,
      },
  
diff --git a/include/exec/memory.h b/include/exec/memory.h

index 48df5abe133660cb7ecae52ff5a728e7946b183f..bd7fdd60810ef697a5d433896ade4ea00e32ac71 100644 (file)
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -1984,7 +1984,7 @@ void memory_global_dirty_log_start(void);
   */
  void memory_global_dirty_log_stop(void);
  
-void mtree_info(bool flatview, bool dispatch_tree, bool owner);
+void mtree_info(bool flatview, bool dispatch_tree, bool owner, bool disabled);
  
  /**
   * memory_region_dispatch_read: perform a read directly to the specified
diff --git a/memory.c b/memory.c

index 91ceaf9fcf45e645fb4ef41365e19f138d08ff1c..2f15a4b250c81ebe52bb76e19250929acd261ff4 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -2882,7 +2882,7 @@ static void mtree_print_mr_owner(const MemoryRegion *mr)
  static void mtree_print_mr(const MemoryRegion *mr, unsigned int level,
                             hwaddr base,
                             MemoryRegionListHead *alias_print_queue,
-                           bool owner)
+                           bool owner, bool display_disabled)
  {
      MemoryRegionList *new_ml, *ml, *next_ml;
      MemoryRegionListHead submr_print_queue;
@@ -2894,10 +2894,6 @@ static void mtree_print_mr(const MemoryRegion *mr, unsigned int level,
          return;
      }
  
-    for (i = 0; i < level; i++) {
-        qemu_printf(MTREE_INDENT);
-    }
-
      cur_start = base + mr->addr;
      cur_end = cur_start + MR_SIZE(mr->size);
  
@@ -2926,35 +2922,46 @@ static void mtree_print_mr(const MemoryRegion *mr, unsigned int level,
              ml->mr = mr->alias;
              QTAILQ_INSERT_TAIL(alias_print_queue, ml, mrqueue);
          }
-        qemu_printf(TARGET_FMT_plx "-" TARGET_FMT_plx
-                    " (prio %d, %s%s): alias %s @%s " TARGET_FMT_plx
-                    "-" TARGET_FMT_plx "%s",
-                    cur_start, cur_end,
-                    mr->priority,
-                    mr->nonvolatile ? "nv-" : "",
-                    memory_region_type((MemoryRegion *)mr),
-                    memory_region_name(mr),
-                    memory_region_name(mr->alias),
-                    mr->alias_offset,
-                    mr->alias_offset + MR_SIZE(mr->size),
-                    mr->enabled ? "" : " [disabled]");
-        if (owner) {
-            mtree_print_mr_owner(mr);
+        if (mr->enabled || display_disabled) {
+            for (i = 0; i < level; i++) {
+                qemu_printf(MTREE_INDENT);
+            }
+            qemu_printf(TARGET_FMT_plx "-" TARGET_FMT_plx
+                        " (prio %d, %s%s): alias %s @%s " TARGET_FMT_plx
+                        "-" TARGET_FMT_plx "%s",
+                        cur_start, cur_end,
+                        mr->priority,
+                        mr->nonvolatile ? "nv-" : "",
+                        memory_region_type((MemoryRegion *)mr),
+                        memory_region_name(mr),
+                        memory_region_name(mr->alias),
+                        mr->alias_offset,
+                        mr->alias_offset + MR_SIZE(mr->size),
+                        mr->enabled ? "" : " [disabled]");
+            if (owner) {
+                mtree_print_mr_owner(mr);
+            }
+            qemu_printf("\n");
          }
      } else {
-        qemu_printf(TARGET_FMT_plx "-" TARGET_FMT_plx
-                    " (prio %d, %s%s): %s%s",
-                    cur_start, cur_end,
-                    mr->priority,
-                    mr->nonvolatile ? "nv-" : "",
-                    memory_region_type((MemoryRegion *)mr),
-                    memory_region_name(mr),
-                    mr->enabled ? "" : " [disabled]");
-        if (owner) {
-            mtree_print_mr_owner(mr);
+        if (mr->enabled || display_disabled) {
+            for (i = 0; i < level; i++) {
+                qemu_printf(MTREE_INDENT);
+            }
+            qemu_printf(TARGET_FMT_plx "-" TARGET_FMT_plx
+                        " (prio %d, %s%s): %s%s",
+                        cur_start, cur_end,
+                        mr->priority,
+                        mr->nonvolatile ? "nv-" : "",
+                        memory_region_type((MemoryRegion *)mr),
+                        memory_region_name(mr),
+                        mr->enabled ? "" : " [disabled]");
+            if (owner) {
+                mtree_print_mr_owner(mr);
+            }
+            qemu_printf("\n");
          }
      }
-    qemu_printf("\n");
  
      QTAILQ_INIT(&submr_print_queue);
  
@@ -2977,7 +2984,7 @@ static void mtree_print_mr(const MemoryRegion *mr, unsigned int level,
  
      QTAILQ_FOREACH(ml, &submr_print_queue, mrqueue) {
          mtree_print_mr(ml->mr, level + 1, cur_start,
-                       alias_print_queue, owner);
+                       alias_print_queue, owner, display_disabled);
      }
  
      QTAILQ_FOREACH_SAFE(ml, &submr_print_queue, mrqueue, next_ml) {
@@ -3088,7 +3095,7 @@ static gboolean mtree_info_flatview_free(gpointer key, gpointer value,
      return true;
  }
  
-void mtree_info(bool flatview, bool dispatch_tree, bool owner)
+void mtree_info(bool flatview, bool dispatch_tree, bool owner, bool disabled)
  {
      MemoryRegionListHead ml_head;
      MemoryRegionList *ml, *ml2;
@@ -3136,14 +3143,14 @@ void mtree_info(bool flatview, bool dispatch_tree, bool owner)
  
      QTAILQ_FOREACH(as, &address_spaces, address_spaces_link) {
          qemu_printf("address-space: %s\n", as->name);
-        mtree_print_mr(as->root, 1, 0, &ml_head, owner);
+        mtree_print_mr(as->root, 1, 0, &ml_head, owner, disabled);
          qemu_printf("\n");
      }
  
      /* print aliased regions */
      QTAILQ_FOREACH(ml, &ml_head, mrqueue) {
          qemu_printf("memory-region: %s\n", memory_region_name(ml->mr));
-        mtree_print_mr(ml->mr, 1, 0, &ml_head, owner);
+        mtree_print_mr(ml->mr, 1, 0, &ml_head, owner, disabled);
          qemu_printf("\n");
      }
  
diff --git a/monitor/misc.c b/monitor/misc.c

index f5207cd24284cb7b752ee01bdca7a8b8563c5ff2..89bb970b00452dd071c02d3518d3c37cfa367dc3 100644 (file)
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -957,8 +957,9 @@ static void hmp_info_mtree(Monitor *mon, const QDict *qdict)
      bool flatview = qdict_get_try_bool(qdict, "flatview", false);
      bool dispatch_tree = qdict_get_try_bool(qdict, "dispatch_tree", false);
      bool owner = qdict_get_try_bool(qdict, "owner", false);
+    bool disabled = qdict_get_try_bool(qdict, "disabled", false);
  
-    mtree_info(flatview, dispatch_tree, owner);
+    mtree_info(flatview, dispatch_tree, owner, disabled);
  }
  
  #ifdef CONFIG_PROFILER
author	Philippe Mathieu-Daudé <philmd@redhat.com>
	Fri, 29 May 2020 12:53:25 +0000 (14:53 +0200)
committer	Paolo Bonzini <pbonzini@redhat.com>
	Wed, 10 Jun 2020 16:10:49 +0000 (12:10 -0400)
hmp-commands-info.hx		patch \| blob \| blame \| history
include/exec/memory.h		patch \| blob \| blame \| history
memory.c		patch \| blob \| blame \| history
monitor/misc.c		patch \| blob \| blame \| history