From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:40886)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1R6lfb-0006DB-Bu
	for qemu-devel@nongnu.org; Thu, 22 Sep 2011 11:58:40 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1R6lfW-0003o9-Fe
	for qemu-devel@nongnu.org; Thu, 22 Sep 2011 11:58:39 -0400
Received: from mail-gx0-f173.google.com ([209.85.161.173]:55515)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1R6lfW-0003o5-Bq
	for qemu-devel@nongnu.org; Thu, 22 Sep 2011 11:58:34 -0400
Received: by gxk25 with SMTP id 25so2412469gxk.4
	for <qemu-devel@nongnu.org>; Thu, 22 Sep 2011 08:58:33 -0700 (PDT)
Message-ID: <4E7B5B27.2090706@codemonkey.ws>
Date: Thu, 22 Sep 2011 10:58:31 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <4E79D773.6040406@redhat.com>
In-Reply-To: <4E79D773.6040406@redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PULL] memory core fix
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Avi Kivity <avi@redhat.com>
Cc: qemu-devel <qemu-devel@nongnu.org>

On 09/21/2011 07:24 AM, Avi Kivity wrote:
> Please pull from
>
> git://github.com/avikivity/qemu.git memory/core

Pulled.  Thanks.

Regards,

Anthony Liguori


> 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) {
>