aboutsummaryrefslogtreecommitdiff
path: root/memory.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2011-09-27 15:00:41 +0200
committerAvi Kivity <avi@redhat.com>2011-10-02 16:27:14 +0200
commit9479c57a8c1e6c33f171ca7c93fea84567045833 (patch)
treea0a6f66e0343d0f986254d141f9ed5283b7a8b30 /memory.c
parent066318109fa2f377e5097f115a23f85c53f1a674 (diff)
downloadqemu-9479c57a8c1e6c33f171ca7c93fea84567045833.zip
qemu-9479c57a8c1e6c33f171ca7c93fea84567045833.tar.gz
qemu-9479c57a8c1e6c33f171ca7c93fea84567045833.tar.bz2
memory: Print regions in ascending order
Makes reading the output more user friendly. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'memory.c')
-rw-r--r--memory.c37
1 files changed, 31 insertions, 6 deletions
diff --git a/memory.c b/memory.c
index 19f1d36..f46e626 100644
--- a/memory.c
+++ b/memory.c
@@ -1285,12 +1285,13 @@ typedef QTAILQ_HEAD(queue, MemoryRegionList) MemoryRegionListHead;
static void mtree_print_mr(fprintf_function mon_printf, void *f,
const MemoryRegion *mr, unsigned int level,
target_phys_addr_t base,
- MemoryRegionListHead *print_queue)
+ MemoryRegionListHead *alias_print_queue)
{
+ MemoryRegionList *new_ml, *ml, *next_ml;
+ MemoryRegionListHead submr_print_queue;
const MemoryRegion *submr;
unsigned int i;
-
if (!mr) {
return;
}
@@ -1304,7 +1305,7 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
bool found = false;
/* check if the alias is already in the queue */
- QTAILQ_FOREACH(ml, print_queue, queue) {
+ QTAILQ_FOREACH(ml, alias_print_queue, queue) {
if (ml->mr == mr->alias && !ml->printed) {
found = true;
}
@@ -1314,7 +1315,7 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
ml = g_new(MemoryRegionList, 1);
ml->mr = mr->alias;
ml->printed = false;
- QTAILQ_INSERT_TAIL(print_queue, ml, queue);
+ QTAILQ_INSERT_TAIL(alias_print_queue, ml, queue);
}
mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d): alias %s @%s "
TARGET_FMT_plx "-" TARGET_FMT_plx "\n",
@@ -1332,9 +1333,33 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
mr->priority,
mr->name);
}
+
+ QTAILQ_INIT(&submr_print_queue);
+
QTAILQ_FOREACH(submr, &mr->subregions, subregions_link) {
- mtree_print_mr(mon_printf, f, submr, level + 1, base + mr->addr,
- print_queue);
+ new_ml = g_new(MemoryRegionList, 1);
+ new_ml->mr = submr;
+ QTAILQ_FOREACH(ml, &submr_print_queue, queue) {
+ if (new_ml->mr->addr < ml->mr->addr ||
+ (new_ml->mr->addr == ml->mr->addr &&
+ new_ml->mr->priority > ml->mr->priority)) {
+ QTAILQ_INSERT_BEFORE(ml, new_ml, queue);
+ new_ml = NULL;
+ break;
+ }
+ }
+ if (new_ml) {
+ QTAILQ_INSERT_TAIL(&submr_print_queue, new_ml, queue);
+ }
+ }
+
+ QTAILQ_FOREACH(ml, &submr_print_queue, queue) {
+ mtree_print_mr(mon_printf, f, ml->mr, level + 1, base + mr->addr,
+ alias_print_queue);
+ }
+
+ QTAILQ_FOREACH_SAFE(next_ml, &submr_print_queue, queue, ml) {
+ g_free(ml);
}
}