commit f17ec444c3d39f76bcd8b71c2c05d5754bfe333e
author Andreas Färber <afaerber@suse.de> Sat Jun 29 19:40:58 2013 +0200
committer Andreas Färber <afaerber@suse.de> Tue Jul 23 02:41:33 2013 +0200
tree 9a314b7aed083e6b3eaf50b04809b57108d0a5cb
parent 00b941e581b5c42645f836ef530705bb76a3e6bb

exec: Change cpu_memory_rw_debug() argument to CPUState

Propagate X86CPU in kvmvapic for simplicity.

Signed-off-by: Andreas Färber <afaerber@suse.de>

disas.c

diff --git a/disas.c b/disas.c
index e51127e..71007fb 100644
--- a/disas.c
+++ b/disas.c
@@ -39,7 +39,7 @@
 {
     CPUDebug *s = container_of(info, CPUDebug, info);
 
-    cpu_memory_rw_debug(s->env, memaddr, myaddr, length, 0);
+    cpu_memory_rw_debug(ENV_GET_CPU(s->env), memaddr, myaddr, length, 0);
     return 0;
 }
 
@@ -392,7 +392,7 @@
     if (monitor_disas_is_physical) {
         cpu_physical_memory_read(memaddr, myaddr, length);
     } else {
-        cpu_memory_rw_debug(s->env, memaddr,myaddr, length, 0);
+        cpu_memory_rw_debug(ENV_GET_CPU(s->env), memaddr, myaddr, length, 0);
     }
     return 0;
 }