mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qemu-kvm-tmp/memory/core' into staging

Browse Source
This commit is contained in:
Anthony Liguori 2011-09-22 10:30:01 -05:00
commit ed95ee87a5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
memory.c
View File

@ -1190,16 +1190,19 @@ static void memory_region_add_subregion_common(MemoryRegion *mr,
if (subregion->may_overlap || other->may_overlap) {
continue;
}
if (offset >= other->offset + other->size
|| offset + subregion->size <= other->offset) {
if (offset >= other->addr + other->size
|| offset + subregion->size <= other->addr) {
continue;
}
#if 0
printf("warning: subregion collision %llx/%llx vs %llx/%llx\n",
printf("warning: subregion collision %llx/%llx (%s) "
"vs %llx/%llx (%s)\n",
(unsigned long long)offset,
(unsigned long long)subregion->size,
(unsigned long long)other->offset,
(unsigned long long)other->size);
subregion->name,
(unsigned long long)other->addr,
(unsigned long long)other->size,
other->name);
#endif
}
QTAILQ_FOREACH(other, &mr->subregions, subregions_link) {