summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-08-22 11:14:56 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-08-22 11:14:56 -0500
commita5e1cbc80e88ed7d73b3fcb46053a3ba167293fc (patch)
tree11fe44f92689bd4d2665c8668f90c61af04da7e2
parentae0a54664c76f1d2a2a7a268266d47b4e8c12a4c (diff)
downloadqemu-a5e1cbc80e88ed7d73b3fcb46053a3ba167293fc.tar.gz
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>
-rw-r--r--memory.c2
1 files changed, 2 insertions, 0 deletions
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) {