Merge commit '4d9ad7f793605abd9806fc932b3e04e028894565' into upstream-merge

* commit '4d9ad7f793605abd9806fc932b3e04e028894565': (48 commits)
  target-arm: Don't overflow when calculating value for signed VABAL
  Revert SeaBIOS change due to overzealous commit -a
  lm32: fix build breakage due to uninitialized variable 'r'
  vpc.c: Use get_option_parameter() does the search
  atapi: GESN: implement 'media' subcommand
  atapi: GESN: Standardise event response handling for future additions
  atapi: GESN: Use structs for commonly-used field types
  atapi: Move GET_EVENT_STATUS_NOTIFICATION command handling to its own function
  atapi: Allow GET_EVENT_STATUS_NOTIFICATION after media change
  atapi: Report correct errors on guest eject request
  atapi: Drives can be locked without media present
  qed: Add support for zero clusters
  docs: Describe zero data clusters in QED specification
  target-arm: Detect tininess before rounding for FP operations
  softfloat: Add setter function for tininess detection mode
  target-arm: Handle UNDEF cases for VDUP (scalar)
  target-arm: Treat UNPREDICTABLE VTBL, VTBX case as UNDEF
  target-arm: Handle UNDEF cases for Neon 2 register misc forms
  target-arm: Simplify checking of size field in Neon 2reg-misc forms
  target-arm: Handle UNDEF cases for VEXT
  ...

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/exec.c b/exec.c
index 68f3cfe3d..594dfcbbd 100644
--- a/exec.c
+++ b/exec.c
@@ -3961,7 +3961,7 @@ void *cpu_physical_memory_map(target_phys_addr_t addr,
             bounce.addr = addr;
             bounce.len = l;
             if (!is_write) {
-                cpu_physical_memory_rw(addr, bounce.buffer, l, 0);
+                cpu_physical_memory_read(addr, bounce.buffer, l);
             }
             ptr = bounce.buffer;
         } else {
@@ -4286,7 +4286,7 @@ void stw_phys(target_phys_addr_t addr, uint32_t val)
 void stq_phys(target_phys_addr_t addr, uint64_t val)
 {
     val = tswap64(val);
-    cpu_physical_memory_write(addr, (const uint8_t *)&val, 8);
+    cpu_physical_memory_write(addr, &val, 8);
 }
 
 /* virtual memory access for debug (includes writing to ROM) */