From: Alexey Kardashevskiy <aik@ozlabs.ru>
To: qemu-devel@nongnu.org
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [Qemu-devel] [PATCH qemu v3 13/13] memory: Add flat views to HMP "info mtree"
Date: Mon, 18 Sep 2017 20:17:09 +1000 [thread overview]
Message-ID: <20170918101709.30421-14-aik@ozlabs.ru> (raw)
In-Reply-To: <20170918101709.30421-1-aik@ozlabs.ru>
This adds a new switch to "info mtree" to print dispatch tree internals.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
Changes:
v3:
* reimplemented as there is no more global FlatView list
---
Example:
aik@fstn1-p1:~$ echo "info mtree -f -d" | nc localhost 30000
QEMU 2.10.50 monitor - type 'help' for more information
(qemu) info mtree -f -d
FlatView #0
AS "nec-usb-xhci", root: bus master container
Root memory region: bus master container
0000000000000000-000000003fffffff (prio 0, i/o): tce-iommu-80000000
0000040000000000-000004000000ffff (prio 0, i/o): msi
Dispatch
Physical sections
#0 @0000000000000000..ffffffffffffffff (noname) [unassigned]
#1 @0000000000000000..ffffffffffffffff (noname) [not dirty]
#2 @0000000000000000..ffffffffffffffff (noname) [ROM]
#3 @0000000000000000..ffffffffffffffff (noname) [watch]
#4 @0000000000000000..000000003fffffff tce-iommu-80000000 [iommu]
#5 @0000040000000000..000004000000ffff msi
Nodes (9 bits per level, 6 levels) ptr=[2] skip=3
[0]
0 skip=2 ptr=[2]
1..511 skip=1 ptr=NIL
[1]
0 skip=1 ptr=[2]
1..511 skip=1 ptr=NIL
[2]
0 skip=0 ptr=#4
1..7 skip=1 ptr=NIL
8 skip=3 ptr=[6]
9..511 skip=1 ptr=NIL
[3]
0 skip=0 ptr=#4
1..511 skip=1 ptr=NIL
[4]
0 skip=2 ptr=[6]
1..511 skip=1 ptr=NIL
[5]
0 skip=1 ptr=[6]
1..511 skip=1 ptr=NIL
[6]
0..15 skip=0 ptr=#5
16..511 skip=0 ptr=#0
FlatView #1
AS "vfio-pci", root: bus master container
Root memory region: bus master container
0000000000000000-000000003fffffff (prio 0, i/o): tce-iommu-80000000
0000040000000000-000004000000ffff (prio 0, i/o): msi
Dispatch
Physical sections
#0 @0000000000000000..ffffffffffffffff (noname) [unassigned]
#1 @0000000000000000..ffffffffffffffff (noname) [not dirty]
#2 @0000000000000000..ffffffffffffffff (noname) [ROM]
#3 @0000000000000000..ffffffffffffffff (noname) [watch]
#4 @0000000000000000..000000003fffffff tce-iommu-80000000 [iommu]
#5 @0000040000000000..000004000000ffff msi
Nodes (9 bits per level, 6 levels) ptr=[2] skip=3
[0]
0 skip=2 ptr=[2]
1..511 skip=1 ptr=NIL
[1]
0 skip=1 ptr=[2]
1..511 skip=1 ptr=NIL
[2]
0 skip=0 ptr=#4
1..7 skip=1 ptr=NIL
8 skip=3 ptr=[6]
9..511 skip=1 ptr=NIL
[3]
0 skip=0 ptr=#4
1..511 skip=1 ptr=NIL
[4]
0 skip=2 ptr=[6]
1..511 skip=1 ptr=NIL
[5]
0 skip=1 ptr=[6]
1..511 skip=1 ptr=NIL
[6]
0..15 skip=0 ptr=#5
16..511 skip=0 ptr=#0
FlatView #2
AS "pci@800000020000000", root: pci@800000020000000.iommu-root
Root memory region: pci@800000020000000.iommu-root
0000000000000000-000000003fffffff (prio 0, i/o): tce-iommu-80000000
0000040000000000-000004000000ffff (prio 0, i/o): msi
Dispatch
Physical sections
#0 @0000000000000000..ffffffffffffffff (noname) [unassigned]
#1 @0000000000000000..ffffffffffffffff (noname) [not dirty]
#2 @0000000000000000..ffffffffffffffff (noname) [ROM]
#3 @0000000000000000..ffffffffffffffff (noname) [watch]
#4 @0000000000000000..000000003fffffff tce-iommu-80000000 [iommu]
#5 @0000040000000000..000004000000ffff msi
Nodes (9 bits per level, 6 levels) ptr=[2] skip=3
[0]
0 skip=2 ptr=[2]
1..511 skip=1 ptr=NIL
[1]
0 skip=1 ptr=[2]
1..511 skip=1 ptr=NIL
[2]
0 skip=0 ptr=#4
1..7 skip=1 ptr=NIL
8 skip=3 ptr=[6]
9..511 skip=1 ptr=NIL
[3]
0 skip=0 ptr=#4
1..511 skip=1 ptr=NIL
[4]
0 skip=2 ptr=[6]
1..511 skip=1 ptr=NIL
[5]
0 skip=1 ptr=[6]
1..511 skip=1 ptr=NIL
[6]
0..15 skip=0 ptr=#5
16..511 skip=0 ptr=#0
FlatView #3
AS "memory", root: system
AS "cpu-memory", root: system
AS "cpu-memory", root: system
AS "cpu-memory", root: system
AS "cpu-memory", root: system
AS "cpu-memory", root: system
AS "cpu-memory", root: system
AS "cpu-memory", root: system
AS "cpu-memory", root: system
Root memory region: system
0000000000000000-000000007fffffff (prio 0, ram): ppc_spapr.ram
0000200000000020-000020000000003f (prio 1, i/o): virtio-pci
0000200080000000-000020008000003f (prio 0, i/o): capabilities
0000200080000040-000020008000043f (prio 0, i/o): operational
0000200080000440-000020008000044f (prio 0, i/o): usb3 port #1
0000200080000450-000020008000045f (prio 0, i/o): usb3 port #2
0000200080000460-000020008000046f (prio 0, i/o): usb3 port #3
0000200080000470-000020008000047f (prio 0, i/o): usb3 port #4
0000200080000480-000020008000048f (prio 0, i/o): usb2 port #1
0000200080000490-000020008000049f (prio 0, i/o): usb2 port #2
00002000800004a0-00002000800004af (prio 0, i/o): usb2 port #3
00002000800004b0-00002000800004bf (prio 0, i/o): usb2 port #4
0000200080001000-000020008000121f (prio 0, i/o): runtime
0000200080002000-000020008000281f (prio 0, i/o): doorbell
0000200080003000-00002000800030ff (prio 0, i/o): msix-table
0000200080003800-0000200080003807 (prio 0, i/o): msix-pba
0000200080010000-000020008001ffff (prio 0, ramd): 0021:09:00.0 BAR 0 mmaps[0]
0000200080020000-000020008002007f (prio 0, i/o): msix-table
0000200080020080-0000200080021fff (prio 1, i/o): 0021:09:00.0 BAR 2 @0000000000000080
0000200080030000-000020008003002f (prio 0, i/o): msix-table
0000200080030800-0000200080030807 (prio 0, i/o): msix-pba
0000210000000000-0000210000000fff (prio 0, i/o): virtio-pci-common
0000210000001000-0000210000001fff (prio 0, i/o): virtio-pci-isr
0000210000002000-0000210000002fff (prio 0, i/o): virtio-pci-device
0000210000003000-0000210000003fff (prio 0, i/o): virtio-pci-notify
Dispatch
Physical sections
#0 @0000000000000000..ffffffffffffffff (noname) [unassigned]
#1 @0000000000000000..ffffffffffffffff (noname) [not dirty]
#2 @0000000000000000..ffffffffffffffff (noname) [ROM]
#3 @0000000000000000..ffffffffffffffff (noname) [watch]
#4 @0000000000000000..000000007fffffff ppc_spapr.ram [MRU]
#5 @0000200000000000..0000200000000fff (noname)
#6 @0000200000000020..000020000000003f virtio-pci
#7 @0000200080000000..0000200080000fff (noname)
#8 @0000200080000000..000020008000003f capabilities
#9 @0000200080000040..000020008000043f operational
#10 @0000200080000440..000020008000044f usb3 port #1
#11 @0000200080000450..000020008000045f usb3 port #2
#12 @0000200080000460..000020008000046f usb3 port #3
#13 @0000200080000470..000020008000047f usb3 port #4
#14 @0000200080000480..000020008000048f usb2 port #1
#15 @0000200080000490..000020008000049f usb2 port #2
#16 @00002000800004a0..00002000800004af usb2 port #3
#17 @00002000800004b0..00002000800004bf usb2 port #4
#18 @0000200080001000..0000200080001fff (noname)
#19 @0000200080001000..000020008000121f runtime
#20 @0000200080002000..0000200080002fff (noname)
#21 @0000200080002000..000020008000281f doorbell
#22 @0000200080003000..0000200080003fff (noname)
#23 @0000200080003000..00002000800030ff msix-table
#24 @0000200080003800..0000200080003807 msix-pba
#25 @0000200080010000..000020008001ffff 0021:09:00.0 BAR 0 mmaps[0]
#26 @0000200080020000..0000200080020fff (noname)
#27 @0000200080020000..000020008002007f msix-table
#28 @0000200080020080..000020008002207f 0021:09:00.0 BAR 2
#29 @0000200080021000..0000200080022fff 0021:09:00.0 BAR 2
#30 @0000200080030000..0000200080030fff (noname)
#31 @0000200080030000..000020008003002f msix-table
#32 @0000200080030800..0000200080030807 msix-pba
#33 @0000210000000000..0000210000000fff virtio-pci-common
#34 @0000210000001000..0000210000001fff virtio-pci-isr
#35 @0000210000002000..0000210000002fff virtio-pci-device
#36 @0000210000003000..0000210000003fff virtio-pci-notify
Nodes (9 bits per level, 6 levels) ptr=[2] skip=3
[0]
0 skip=2 ptr=[2]
1..511 skip=1 ptr=NIL
[1]
0 skip=1 ptr=[2]
1..511 skip=1 ptr=NIL
[2]
0 skip=1 ptr=[3]
1..63 skip=1 ptr=NIL
64 skip=1 ptr=[4]
65 skip=1 ptr=NIL
66 skip=3 ptr=[11]
67..511 skip=1 ptr=NIL
[3]
0..1 skip=0 ptr=#4
2..511 skip=1 ptr=NIL
[4]
0 skip=2 ptr=[6]
1 skip=1 ptr=NIL
2 skip=2 ptr=[8]
3..511 skip=1 ptr=NIL
[5]
0 skip=1 ptr=[6]
1..511 skip=1 ptr=NIL
[6]
0 skip=0 ptr=#5
1..511 skip=0 ptr=#0
[7]
0 skip=1 ptr=[8]
1..511 skip=1 ptr=NIL
[8]
0 skip=0 ptr=#7
1 skip=0 ptr=#18
2 skip=0 ptr=#20
3 skip=0 ptr=#22
4..15 skip=0 ptr=#0
16..31 skip=0 ptr=#25
32 skip=0 ptr=#26
33 skip=0 ptr=#29
34..47 skip=0 ptr=#0
48 skip=0 ptr=#30
49..511 skip=0 ptr=#0
[9]
0 skip=2 ptr=[11]
1..511 skip=1 ptr=NIL
[10]
0 skip=1 ptr=[11]
1..511 skip=1 ptr=NIL
[11]
0 skip=0 ptr=#33
1 skip=0 ptr=#34
2 skip=0 ptr=#35
3 skip=0 ptr=#36
4..511 skip=0 ptr=#0
FlatView #4
AS "virtio-net-pci", root: bus master container
Root memory region: bus master container
0000000000000000-000000003fffffff (prio 0, i/o): tce-iommu-80000000
0000040000000000-000004000000ffff (prio 0, i/o): msi
Dispatch
Physical sections
#0 @0000000000000000..ffffffffffffffff (noname) [unassigned]
#1 @0000000000000000..ffffffffffffffff (noname) [not dirty]
#2 @0000000000000000..ffffffffffffffff (noname) [ROM]
#3 @0000000000000000..ffffffffffffffff (noname) [watch]
#4 @0000000000000000..000000003fffffff tce-iommu-80000000 [iommu]
#5 @0000040000000000..000004000000ffff msi
Nodes (9 bits per level, 6 levels) ptr=[2] skip=3
[0]
0 skip=2 ptr=[2]
1..511 skip=1 ptr=NIL
[1]
0 skip=1 ptr=[2]
1..511 skip=1 ptr=NIL
[2]
0 skip=0 ptr=#4
1..7 skip=1 ptr=NIL
8 skip=3 ptr=[6]
9..511 skip=1 ptr=NIL
[3]
0 skip=0 ptr=#4
1..511 skip=1 ptr=NIL
[4]
0 skip=2 ptr=[6]
1..511 skip=1 ptr=NIL
[5]
0 skip=1 ptr=[6]
1..511 skip=1 ptr=NIL
[6]
0..15 skip=0 ptr=#5
16..511 skip=0 ptr=#0
FlatView #5
AS "I/O", root: io
Root memory region: io
0000000000000000-000000000000ffff (prio 0, i/o): io
Dispatch
Physical sections
#0 @0000000000000000..ffffffffffffffff (noname) [unassigned]
#1 @0000000000000000..ffffffffffffffff (noname) [not dirty]
#2 @0000000000000000..ffffffffffffffff (noname) [ROM]
#3 @0000000000000000..ffffffffffffffff (noname) [watch]
#4 @0000000000000000..000000000000ffff io [ROOT]
Nodes (9 bits per level, 6 levels) ptr=[5] skip=6
[0]
0 skip=5 ptr=[5]
1..511 skip=1 ptr=NIL
[1]
0 skip=4 ptr=[5]
1..511 skip=1 ptr=NIL
[2]
0 skip=3 ptr=[5]
1..511 skip=1 ptr=NIL
[3]
0 skip=2 ptr=[5]
1..511 skip=1 ptr=NIL
[4]
0 skip=1 ptr=[5]
1..511 skip=1 ptr=NIL
[5]
0..15 skip=0 ptr=#4
16..511 skip=0 ptr=#0
FlatView #6
AS "virtio-pci-cfg-as", root: virtio-pci-cfg, alias virtio-pci
Root memory region: virtio-pci
0000210000000000-0000210000000fff (prio 0, i/o): virtio-pci-common
0000210000001000-0000210000001fff (prio 0, i/o): virtio-pci-isr
0000210000002000-0000210000002fff (prio 0, i/o): virtio-pci-device
0000210000003000-0000210000003fff (prio 0, i/o): virtio-pci-notify
Dispatch
Physical sections
#0 @0000000000000000..ffffffffffffffff (noname) [unassigned]
#1 @0000000000000000..ffffffffffffffff (noname) [not dirty]
#2 @0000000000000000..ffffffffffffffff (noname) [ROM]
#3 @0000000000000000..ffffffffffffffff (noname) [watch]
#4 @0000210000000000..0000210000000fff virtio-pci-common
#5 @0000210000001000..0000210000001fff virtio-pci-isr
#6 @0000210000002000..0000210000002fff virtio-pci-device
#7 @0000210000003000..0000210000003fff virtio-pci-notify
Nodes (9 bits per level, 6 levels) ptr=[5] skip=6
[0]
0 skip=5 ptr=[5]
1..511 skip=1 ptr=NIL
[1]
0 skip=4 ptr=[5]
1..511 skip=1 ptr=NIL
[2]
0..65 skip=1 ptr=NIL
66 skip=3 ptr=[5]
67..511 skip=1 ptr=NIL
[3]
0 skip=2 ptr=[5]
1..511 skip=1 ptr=NIL
[4]
0 skip=1 ptr=[5]
1..511 skip=1 ptr=NIL
[5]
0 skip=0 ptr=#4
1 skip=0 ptr=#5
2 skip=0 ptr=#6
3 skip=0 ptr=#7
4..511 skip=0 ptr=#0
---
include/exec/memory-internal.h | 4 ++
include/exec/memory.h | 3 +-
exec.c | 84 +++++++++++++++++++++++++++++++++++++++
memory.c | 90 +++++++++++++++++++++++++++++++++++++-----
monitor.c | 3 +-
hmp-commands-info.hx | 7 ++--
6 files changed, 176 insertions(+), 15 deletions(-)
diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h
index d4a35c6e96..647e9bd5c4 100644
--- a/include/exec/memory-internal.h
+++ b/include/exec/memory-internal.h
@@ -35,5 +35,9 @@ AddressSpaceDispatch *address_space_to_dispatch(AddressSpace *as);
AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv);
void address_space_dispatch_free(AddressSpaceDispatch *d);
+void mtree_print_dispatch(fprintf_function mon, void *f,
+ struct AddressSpaceDispatch *d,
+ MemoryRegion *root);
+
#endif
#endif
diff --git a/include/exec/memory.h b/include/exec/memory.h
index d73430b543..402824c6f2 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -1513,7 +1513,8 @@ void memory_global_dirty_log_start(void);
*/
void memory_global_dirty_log_stop(void);
-void mtree_info(fprintf_function mon_printf, void *f, bool flatview);
+void mtree_info(fprintf_function mon_printf, void *f, bool flatview,
+ bool dispatch_tree);
/**
* memory_region_request_mmio_ptr: request a pointer to an mmio
diff --git a/exec.c b/exec.c
index b1f29d35d8..3110e38565 100644
--- a/exec.c
+++ b/exec.c
@@ -3617,3 +3617,87 @@ void page_size_init(void)
}
qemu_host_page_mask = -(intptr_t)qemu_host_page_size;
}
+
+#if !defined(CONFIG_USER_ONLY)
+
+static void mtree_print_phys_entries(fprintf_function mon, void *f,
+ int start, int end, int skip, int ptr)
+{
+ if (start == end - 1) {
+ mon(f, "\t%3d ", start);
+ } else {
+ mon(f, "\t%3d..%-3d ", start, end - 1);
+ }
+ mon(f, " skip=%d ", skip);
+ if (ptr == PHYS_MAP_NODE_NIL) {
+ mon(f, " ptr=NIL");
+ } else if (!skip) {
+ mon(f, " ptr=#%d", ptr);
+ } else {
+ mon(f, " ptr=[%d]", ptr);
+ }
+ mon(f, "\n");
+}
+
+#define MR_SIZE(size) (int128_nz(size) ? (hwaddr)int128_get64( \
+ int128_sub((size), int128_one())) : 0)
+
+void mtree_print_dispatch(fprintf_function mon, void *f,
+ AddressSpaceDispatch *d, MemoryRegion *root)
+{
+ int i;
+
+ mon(f, " Dispatch\n");
+ mon(f, " Physical sections\n");
+
+ for (i = 0; i < d->map.sections_nb; ++i) {
+ MemoryRegionSection *s = d->map.sections + i;
+ const char *names[] = { " [unassigned]", " [not dirty]",
+ " [ROM]", " [watch]" };
+
+ mon(f, " #%d @" TARGET_FMT_plx ".." TARGET_FMT_plx " %s%s%s%s%s",
+ i,
+ s->offset_within_address_space,
+ s->offset_within_address_space + MR_SIZE(s->mr->size),
+ s->mr->name ? s->mr->name : "(noname)",
+ i < ARRAY_SIZE(names) ? names[i] : "",
+ s->mr == root ? " [ROOT]" : "",
+ s == d->mru_section ? " [MRU]" : "",
+ s->mr->is_iommu ? " [iommu]" : "");
+
+ if (s->mr->alias) {
+ mon(f, " alias=%s", s->mr->alias->name ?
+ s->mr->alias->name : "noname");
+ }
+ mon(f, "\n");
+ }
+
+ mon(f, " Nodes (%d bits per level, %d levels) ptr=[%d] skip=%d\n",
+ P_L2_BITS, P_L2_LEVELS, d->phys_map.ptr, d->phys_map.skip);
+ for (i = 0; i < d->map.nodes_nb; ++i) {
+ int j, jprev;
+ PhysPageEntry prev;
+ Node *n = d->map.nodes + i;
+
+ mon(f, " [%d]\n", i);
+
+ for (j = 0, jprev = 0, prev = *n[0]; j < ARRAY_SIZE(*n); ++j) {
+ PhysPageEntry *pe = *n + j;
+
+ if (pe->ptr == prev.ptr && pe->skip == prev.skip) {
+ continue;
+ }
+
+ mtree_print_phys_entries(mon, f, jprev, j, prev.skip, prev.ptr);
+
+ jprev = j;
+ prev = *pe;
+ }
+
+ if (jprev != ARRAY_SIZE(*n)) {
+ mtree_print_phys_entries(mon, f, jprev, j, prev.skip, prev.ptr);
+ }
+ }
+}
+
+#endif
diff --git a/memory.c b/memory.c
index c12507d26d..be08cb3915 100644
--- a/memory.c
+++ b/memory.c
@@ -2854,18 +2854,44 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
}
}
-static void mtree_print_flatview(fprintf_function p, void *f,
- AddressSpace *as)
+struct FlatViewInfo {
+ fprintf_function mon_printf;
+ void *f;
+ int counter;
+ bool dispatch_tree;
+};
+
+static void mtree_print_flatview(gpointer key, gpointer value,
+ gpointer user_data)
{
- FlatView *view = address_space_get_flatview(as);
+ FlatView *view = key;
+ GArray *fv_address_spaces = value;
+ struct FlatViewInfo *fvi = user_data;
+ fprintf_function p = fvi->mon_printf;
+ void *f = fvi->f;
FlatRange *range = &view->ranges[0];
MemoryRegion *mr;
int n = view->nr;
+ int i;
+ AddressSpace *as;
+
+ p(f, "FlatView #%d\n", fvi->counter);
+ ++fvi->counter;
+
+ for (i = 0; i < fv_address_spaces->len; ++i) {
+ as = g_array_index(fv_address_spaces, AddressSpace*, i);
+ p(f, " AS \"%s\", root: %s", as->name, memory_region_name(as->root));
+ if (as->root->alias) {
+ p(f, ", alias %s", memory_region_name(as->root->alias));
+ }
+ p(f, "\n");
+ }
+
+ p(f, " Root memory region: %s\n", memory_region_name(view->root));
if (n <= 0) {
- p(f, MTREE_INDENT "No rendered FlatView for "
- "address space '%s'\n", as->name);
- flatview_unref(view);
+ p(f, MTREE_INDENT "No rendered FlatView, root MR is %s\n\n",
+ view->root->enabled ? "enabled" : "disabled");
return;
}
@@ -2892,21 +2918,65 @@ static void mtree_print_flatview(fprintf_function p, void *f,
range++;
}
+#if !defined(CONFIG_USER_ONLY)
+ if (fvi->dispatch_tree) {
+ mtree_print_dispatch(p, f, view->dispatch, view->root);
+ }
+#endif
+
+ p(f, "\n");
+}
+
+static gboolean mtree_info_flatview_free(gpointer key, gpointer value,
+ gpointer user_data)
+{
+ FlatView *view = key;
+ GArray *fv_address_spaces = value;
+
+ g_array_unref(fv_address_spaces);
flatview_unref(view);
+
+ return true;
}
-void mtree_info(fprintf_function mon_printf, void *f, bool flatview)
+void mtree_info(fprintf_function mon_printf, void *f, bool flatview,
+ bool dispatch_tree)
{
MemoryRegionListHead ml_head;
MemoryRegionList *ml, *ml2;
AddressSpace *as;
if (flatview) {
+ FlatView *view;
+ struct FlatViewInfo fvi = {
+ .mon_printf = mon_printf,
+ .f = f,
+ .counter = 0,
+ .dispatch_tree = dispatch_tree
+ };
+ GArray *fv_address_spaces;
+ GHashTable *views = g_hash_table_new(g_direct_hash, g_direct_equal);
+
+ /* Gather all FVs in one table */
QTAILQ_FOREACH(as, &address_spaces, address_spaces_link) {
- mon_printf(f, "address-space (flat view): %s\n", as->name);
- mtree_print_flatview(mon_printf, f, as);
- mon_printf(f, "\n");
+ view = address_space_get_flatview(as);
+
+ fv_address_spaces = g_hash_table_lookup(views, view);
+ if (!fv_address_spaces) {
+ fv_address_spaces = g_array_new(false, false, sizeof(as));
+ g_hash_table_insert(views, view, fv_address_spaces);
+ }
+
+ g_array_append_val(fv_address_spaces, as);
}
+
+ /* Print */
+ g_hash_table_foreach(views, mtree_print_flatview, &fvi);
+
+ /* Free */
+ g_hash_table_foreach_remove(views, mtree_info_flatview_free, 0);
+ g_hash_table_unref(views);
+
return;
}
diff --git a/monitor.c b/monitor.c
index 058045b3cb..f4856b9268 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1703,8 +1703,9 @@ static void hmp_boot_set(Monitor *mon, const QDict *qdict)
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);
- mtree_info((fprintf_function)monitor_printf, mon, flatview);
+ mtree_info((fprintf_function)monitor_printf, mon, flatview, dispatch_tree);
}
static void hmp_info_numa(Monitor *mon, const QDict *qdict)
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
index 1c6772597d..4f1ece93e5 100644
--- a/hmp-commands-info.hx
+++ b/hmp-commands-info.hx
@@ -250,9 +250,10 @@ ETEXI
{
.name = "mtree",
- .args_type = "flatview:-f",
- .params = "[-f]",
- .help = "show memory tree (-f: dump flat view for address spaces)",
+ .args_type = "flatview:-f,dispatch_tree:-d",
+ .params = "[-f][-d]",
+ .help = "show memory tree (-f: dump flat view for address spaces;"
+ "-d: dump dispatch tree, valid with -f only)",
.cmd = hmp_info_mtree,
},
--
2.11.0
next prev parent reply other threads:[~2017-09-18 10:17 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-18 10:16 [Qemu-devel] [PATCH qemu v3 00/13] memory: Reduce memory use Alexey Kardashevskiy
2017-09-18 10:16 ` [Qemu-devel] [PATCH qemu v3 01/13] memory: Postpone flatview and dispatch tree building till all devices are added Alexey Kardashevskiy
2017-09-18 14:54 ` Paolo Bonzini
2017-09-19 2:09 ` Alexey Kardashevskiy
2017-09-19 6:57 ` Alexey Kardashevskiy
2017-09-19 7:40 ` Paolo Bonzini
2017-09-19 7:57 ` Alexey Kardashevskiy
2017-09-19 7:59 ` Paolo Bonzini
2017-09-19 7:42 ` Paolo Bonzini
2017-09-19 10:39 ` Alexey Kardashevskiy
2017-09-19 10:47 ` Paolo Bonzini
2017-09-19 14:12 ` Alexey Kardashevskiy
2017-09-19 14:23 ` Paolo Bonzini
2017-09-18 10:16 ` [Qemu-devel] [PATCH qemu v3 02/13] exec: Explicitely export target AS from address_space_translate_internal Alexey Kardashevskiy
2017-09-18 14:28 ` Eric Blake
2017-09-19 0:15 ` Alexey Kardashevskiy
2017-09-18 10:16 ` [Qemu-devel] [PATCH qemu v3 03/13] memory: Open code FlatView rendering Alexey Kardashevskiy
2017-09-18 14:28 ` Eric Blake
2017-09-18 10:17 ` [Qemu-devel] [PATCH qemu v3 04/13] memory: Move FlatView allocation to a helper Alexey Kardashevskiy
2017-09-18 10:17 ` [Qemu-devel] [PATCH qemu v3 05/13] memory: Move AddressSpaceDispatch from AddressSpace to FlatView Alexey Kardashevskiy
2017-09-18 10:17 ` [Qemu-devel] [PATCH qemu v3 06/13] memory: Remove AddressSpace pointer from AddressSpaceDispatch Alexey Kardashevskiy
2017-09-18 10:17 ` [Qemu-devel] [PATCH qemu v3 07/13] memory: Switch memory from using AddressSpace to FlatView Alexey Kardashevskiy
2017-09-18 14:06 ` Alexey Kardashevskiy
2017-09-18 10:17 ` [Qemu-devel] [PATCH qemu v3 08/13] memory: Cleanup after switching " Alexey Kardashevskiy
2017-09-18 10:17 ` [Qemu-devel] [PATCH qemu v3 09/13] memory: Rename mem_begin/mem_commit/mem_add helpers Alexey Kardashevskiy
2017-09-18 10:17 ` [Qemu-devel] [PATCH qemu v3 10/13] memory: Store physical root MR in FlatView Alexey Kardashevskiy
2017-09-18 10:17 ` [Qemu-devel] [PATCH qemu v3 11/13] memory: Share FlatView's and dispatch trees between address spaces Alexey Kardashevskiy
2017-09-18 14:37 ` Paolo Bonzini
2017-09-18 10:17 ` [Qemu-devel] [PATCH qemu v3 12/13] memory: Get rid of address_space_init_shareable Alexey Kardashevskiy
2017-09-18 10:17 ` Alexey Kardashevskiy [this message]
2017-09-18 10:36 ` [Qemu-devel] [PATCH qemu v3 00/13] memory: Reduce memory use no-reply
2017-09-18 14:59 ` Paolo Bonzini
2017-09-19 0:19 ` Alexey Kardashevskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170918101709.30421-14-aik@ozlabs.ru \
--to=aik@ozlabs.ru \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.