[Qemu-devel] [PATCH v2 2/2] memory: print aliased IO ranges in info mtree

[Qemu-devel] [PATCH v2 2/2] memory: print aliased IO ranges in info mtree

[Blue Swirl]

[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]

Print also I/O ports behind bridges and other aliases.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 memory.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/memory.c b/memory.c
index 22b0352..a3f5b59 100644
--- a/memory.c
+++ b/memory.c
@@ -1621,6 +1621,13 @@ void mtree_info(fprintf_function mon_printf, void *f)
     mon_printf(f, "memory\n");
     mtree_print_mr(mon_printf, f, address_space_memory.root, 0, 0, &ml_head);

+    if (address_space_io.root &&
+        !QTAILQ_EMPTY(&address_space_io.root->subregions)) {
+        mon_printf(f, "I/O\n");
+        mtree_print_mr(mon_printf, f, address_space_io.root, 0, 0, &ml_head);
+    }
+
+    mon_printf(f, "aliases\n");
     /* print aliased regions */
     QTAILQ_FOREACH(ml, &ml_head, queue) {
         if (!ml->printed) {
@@ -1632,11 +1639,4 @@ void mtree_info(fprintf_function mon_printf, void *f)
     QTAILQ_FOREACH_SAFE(ml, &ml_head, queue, ml2) {
         g_free(ml);
     }
-
-    if (address_space_io.root &&
-        !QTAILQ_EMPTY(&address_space_io.root->subregions)) {
-        QTAILQ_INIT(&ml_head);
-        mon_printf(f, "I/O\n");
-        mtree_print_mr(mon_printf, f, address_space_io.root, 0, 0, &ml_head);
-    }
 }
-- 
1.7.9

[-- Attachment #2: 0002-memory-print-aliased-IO-ranges-in-info-mtree.patch --]
[-- Type: text/x-diff, Size: 1744 bytes --]

From dd09131faaace204878c23c3e019061953ad3305 Mon Sep 17 00:00:00 2001
Message-Id: <dd09131faaace204878c23c3e019061953ad3305.1332072300.git.blauwirbel@gmail.com>
In-Reply-To: <b13b8706a5a44c1d35c0ce459cbb9fde01dc910f.1332072300.git.blauwirbel@gmail.com>
References: <b13b8706a5a44c1d35c0ce459cbb9fde01dc910f.1332072300.git.blauwirbel@gmail.com>
From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 10 Mar 2012 16:58:35 +0000
Subject: [PATCH 2/2] memory: print aliased IO ranges in info mtree

Print also I/O ports behind bridges and other aliases.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 memory.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/memory.c b/memory.c
index 22b0352..a3f5b59 100644
--- a/memory.c
+++ b/memory.c
@@ -1621,6 +1621,13 @@ void mtree_info(fprintf_function mon_printf, void *f)
     mon_printf(f, "memory\n");
     mtree_print_mr(mon_printf, f, address_space_memory.root, 0, 0, &ml_head);
 
+    if (address_space_io.root &&
+        !QTAILQ_EMPTY(&address_space_io.root->subregions)) {
+        mon_printf(f, "I/O\n");
+        mtree_print_mr(mon_printf, f, address_space_io.root, 0, 0, &ml_head);
+    }
+
+    mon_printf(f, "aliases\n");
     /* print aliased regions */
     QTAILQ_FOREACH(ml, &ml_head, queue) {
         if (!ml->printed) {
@@ -1632,11 +1639,4 @@ void mtree_info(fprintf_function mon_printf, void *f)
     QTAILQ_FOREACH_SAFE(ml, &ml_head, queue, ml2) {
         g_free(ml);
     }
-
-    if (address_space_io.root &&
-        !QTAILQ_EMPTY(&address_space_io.root->subregions)) {
-        QTAILQ_INIT(&ml_head);
-        mon_printf(f, "I/O\n");
-        mtree_print_mr(mon_printf, f, address_space_io.root, 0, 0, &ml_head);
-    }
 }
-- 
1.7.2.5

Re: [Qemu-devel] [PATCH v2 2/2] memory: print aliased IO ranges in info mtree

[Avi Kivity]

On 03/18/2012 02:05 PM, Blue Swirl wrote:
> Print also I/O ports behind bridges and other aliases.
>

Thanks, both applied.

-- 
error compiling committee.c: too many arguments to function