From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53565) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9gBD-0001jK-0e for qemu-devel@nongnu.org; Mon, 19 Mar 2012 13:15:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S9gBB-0001Md-4W for qemu-devel@nongnu.org; Mon, 19 Mar 2012 13:15:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55083) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9gBA-0001MX-T3 for qemu-devel@nongnu.org; Mon, 19 Mar 2012 13:15:33 -0400 Message-ID: <4F6769AF.4090201@redhat.com> Date: Mon, 19 Mar 2012 19:15:27 +0200 From: Avi Kivity MIME-Version: 1.0 References: <4F66FF17.90303@redhat.com> In-Reply-To: <4F66FF17.90303@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL] Memory core regression fixes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel , Anthony Liguori , Blue Swirl 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 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 Signed-off-by: Avi Kivity 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); } -- error compiling committee.c: too many arguments to function