From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 22 Aug 2011 16:14:56 +0000 (-0500)
Subject: memory: temporarily suppress the subregion collision warning
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a5e1cbc80e88ed7d73b3fcb46053a3ba167293fc;p=qemu.git

memory: temporarily suppress the subregion collision warning

After 312b4234, the APIC and PCI devices are colliding with each other.  This
is harmless in practice because the APIC accesses are special cased and never
make there way onto the bus.

Avi is working on a proper fix, but until that's ready, avoid printing the
warning.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/memory.c b/memory.c
index 30ba4a4b37..531b57533a 100644
--- a/memory.c
+++ b/memory.c
@@ -1191,11 +1191,13 @@ static void memory_region_add_subregion_common(MemoryRegion *mr,
             || offset + subregion->size <= other->offset) {
             continue;
         }
+#if 0
         printf("warning: subregion collision %llx/%llx vs %llx/%llx\n",
                (unsigned long long)offset,
                (unsigned long long)subregion->size,
                (unsigned long long)other->offset,
                (unsigned long long)other->size);
+#endif
     }
     QTAILQ_FOREACH(other, &mr->subregions, subregions_link) {
         if (subregion->priority >= other->priority) {