summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2012-09-10 12:30:57 +1000
committerDoug Goldstein <cardoe@cardoe.com>2012-10-24 02:04:36 -0500
commitab12906b61c4c483c4ea5eb9d9728f718aec4702 (patch)
treec2c08d7aa4af06397367ea4f54ea073c33e634d5
parentfix doc of using raw values with sendkey (diff)
downloadqemu-kvm-ab12906b61c4c483c4ea5eb9d9728f718aec4702.tar.gz
qemu-kvm-ab12906b61c4c483c4ea5eb9d9728f718aec4702.tar.bz2
qemu-kvm-ab12906b61c4c483c4ea5eb9d9728f718aec4702.zip
cpu_physical_memory_write_rom() needs to do TB invalidates
cpu_physical_memory_write_rom(), despite the name, can also be used to write images into RAM - and will often be used that way if the machine uses load_image_targphys() into RAM addresses. However, cpu_physical_memory_write_rom(), unlike cpu_physical_memory_rw() doesn't invalidate any cached TBs which might be affected by the region written. This was breaking reset (under full emu) on the pseries machine - we loaded our firmware image into RAM, and while executing it rewrite the code at the entry point (correctly causing a TB invalidate/refresh). When we reset the firmware image was reloaded, but the TB from the rewrite was still active and caused us to get an illegal instruction trap. This patch fixes the bug by duplicating the tb invalidate code from cpu_physical_memory_rw() in cpu_physical_memory_write_rom(). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 0b57e287138728f72d88b06e69b970c5d745c44a)
-rw-r--r--exec.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/exec.c b/exec.c
index 0a67f078c..8e97f93a7 100644
--- a/exec.c
+++ b/exec.c
@@ -3625,6 +3625,13 @@ void cpu_physical_memory_write_rom(target_phys_addr_t addr,
/* ROM/RAM case */
ptr = qemu_get_ram_ptr(addr1);
memcpy(ptr, buf, l);
+ if (!cpu_physical_memory_is_dirty(addr1)) {
+ /* invalidate code */
+ tb_invalidate_phys_page_range(addr1, addr1 + l, 0);
+ /* set dirty bit */
+ cpu_physical_memory_set_dirty_flags(
+ addr1, (0xff & ~CODE_DIRTY_FLAG));
+ }
qemu_put_ram_ptr(ptr);
}
len -= l;