From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:59122)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1S9jwe-0008F6-HZ
	for qemu-devel@nongnu.org; Mon, 19 Mar 2012 17:16:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1S9jwc-0006uL-Ks
	for qemu-devel@nongnu.org; Mon, 19 Mar 2012 17:16:48 -0400
Received: from mail-ob0-f173.google.com ([209.85.214.173]:49933)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1S9jwc-0006uD-Fq
	for qemu-devel@nongnu.org; Mon, 19 Mar 2012 17:16:46 -0400
Received: by obbwd20 with SMTP id wd20so1455522obb.4
	for <qemu-devel@nongnu.org>; Mon, 19 Mar 2012 14:16:45 -0700 (PDT)
Message-ID: <4F67A23A.1090809@codemonkey.ws>
Date: Mon, 19 Mar 2012 16:16:42 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <4F66FF17.90303@redhat.com> <4F6769AF.4090201@redhat.com>
In-Reply-To: <4F6769AF.4090201@redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PULL] Memory core regression fixes
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: Blue Swirl <blauwirbel@gmail.com>, qemu-devel <qemu-devel@nongnu.org>

On 03/19/2012 12:15 PM, Avi Kivity wrote:
> On 03/19/2012 11:40 AM, Avi Kivity wrote:
>> The last memory core pull introduced a couple of regressions; here are
>> the fixes.
>>
>> Please pull from:
>>
>>    git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/urgent
>>
>
> I've tacked on another patch to this branch, fixing a xen regression:
>
> commit 0a1b357f1555ce410d2d0d5f947b5415587ac4d8
> Author: Anthony PERARD<anthony.perard@citrix.com>
> Date:   Mon Mar 19 15:54:34 2012 +0000
>
>      exec: fix guest memory access for Xen
>
>      In cpu_physical_memory_rw, a change has been introduced and
> qemu_get_ram_ptr is
>      no longuer called with the ram addr we want to access, but only with the
>      section address. This patch fixes this. (All other call to
> qemu_get_ram_ptr are
>      already called with the right address.)
>
>      This patch fixes Xen guest.
>
>      Signed-off-by: Anthony PERARD<anthony.perard@citrix.com>
>      Signed-off-by: Avi Kivity<avi@redhat.com>

Pulled this too.  Thanks.

Regards,

Anthony Liguori

>
> diff --git a/exec.c b/exec.c
> index a3818ff..265e895 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -3856,8 +3856,8 @@ void cpu_physical_memory_rw(target_phys_addr_t
> addr, uint8_t *buf,
>                   }
>               } else {
>                   /* RAM case */
> -                ptr = qemu_get_ram_ptr(section->mr->ram_addr)
> -                    + section_addr(section, addr);
> +                ptr = qemu_get_ram_ptr(section->mr->ram_addr
> +                                       + section_addr(section, addr));
>                   memcpy(buf, ptr, l);
>                   qemu_put_ram_ptr(ptr);
>               }
>