Re: [Qemu-devel] [PULL] Memory core regression fixes

[Anthony Liguori <anthony@codemonkey.ws>]

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:

I'm become a bigger fan of not using a single branch for pull requests and 
instead doing what Gerd does an use a monotonically increasing branch.  For 
instance:

memory/urgent.1
memory/urgent.2
...

It avoids confusion caused by situations like this because you can immediately 
submit another PULL request if needed and I can just ignore the last one without 
fear of race conditions.

At any rate, I'm going to handle this as a separate merge as your previous pull 
is about to be pushed.

Regards,

Anthony Liguori

>
> 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>
>
> 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);
>               }
>