Merge remote-tracking branch 'qemu-kvm/memory/urgent' into staging

* qemu-kvm/memory/urgent: exec: fix guest memory access for Xen
2012-03-19 13:36:18 -05:00 · 2012-03-19 13:36:18 -05:00 · be793eb3b9
commit be793eb3b9
parent efeaaf1ebc 0a1b357f15
1 changed files with 2 additions and 2 deletions
--- 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);
            }