Commit be793eb3 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

* qemu-kvm/memory/urgent:
  exec: fix guest memory access for Xen
parents efeaaf1e 0a1b357f

exec.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

            }