diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 13:36:18 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 13:36:18 -0500 |
| commit | be793eb3b9d04ce524cebcffb96e9770d68e57d9 (patch) | |
| tree | 86cdd2399a6ca08639bc32b3dfcd32472bf57e87 | |
| parent | efeaaf1ebc0f677dc321845d74b8d6f599eb0927 (diff) | |
| parent | 0a1b357f1555ce410d2d0d5f947b5415587ac4d8 (diff) | |
| download | focaccia-qemu-be793eb3b9d04ce524cebcffb96e9770d68e57d9.tar.gz focaccia-qemu-be793eb3b9d04ce524cebcffb96e9770d68e57d9.zip | |
Merge remote-tracking branch 'qemu-kvm/memory/urgent' into staging
* qemu-kvm/memory/urgent: exec: fix guest memory access for Xen
| -rw-r--r-- | exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/exec.c b/exec.c index a3818ffeb7..265e895603 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); } |