[Qemu-devel] [PULL] memory core fix

[Avi Kivity <avi@redhat.com>]

Please pull from

   git://github.com/avikivity/qemu.git memory/core

to receive the following fix:

Michael Walle (1):
       memory: fix subregion collision warning

  memory.c |   13 ++++++++-----
  1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/memory.c b/memory.c
index 101b67c..ba74435 100644
--- a/memory.c
+++ b/memory.c
@@ -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) {

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