From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6Lqo-00051C-Gk for qemu-devel@nongnu.org; Wed, 21 Sep 2011 08:24:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R6Lqk-0006EL-BT for qemu-devel@nongnu.org; Wed, 21 Sep 2011 08:24:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39542) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6Lqj-0006ED-Uo for qemu-devel@nongnu.org; Wed, 21 Sep 2011 08:24:26 -0400 Message-ID: <4E79D773.6040406@redhat.com> Date: Wed, 21 Sep 2011 15:24:19 +0300 From: Avi Kivity MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PULL] memory core fix List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , qemu-devel 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