[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6321] Adopt cpu_copy to new breakpoint API (Jan Kaszka)
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [6321] Adopt cpu_copy to new breakpoint API (Jan Kaszka) |
Date: |
Thu, 15 Jan 2009 20:16:52 +0000 |
Revision: 6321
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6321
Author: aliguori
Date: 2009-01-15 20:16:51 +0000 (Thu, 15 Jan 2009)
Log Message:
-----------
Adopt cpu_copy to new breakpoint API (Jan Kaszka)
Latest changes to the cpu_breakpoint/watchpoint API broke cpu_copy. This
patch fixes it by cloning the breakpoint and watchpoint lists
appropriately.
Thanks to Lionel Landwerlin for pointing out.
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/exec.c
Modified: trunk/exec.c
===================================================================
--- trunk/exec.c 2009-01-15 20:11:34 UTC (rev 6320)
+++ trunk/exec.c 2009-01-15 20:16:51 UTC (rev 6321)
@@ -1654,12 +1654,34 @@
CPUState *cpu_copy(CPUState *env)
{
CPUState *new_env = cpu_init(env->cpu_model_str);
- /* preserve chaining and index */
CPUState *next_cpu = new_env->next_cpu;
int cpu_index = new_env->cpu_index;
+#if defined(TARGET_HAS_ICE)
+ CPUBreakpoint *bp;
+ CPUWatchpoint *wp;
+#endif
+
memcpy(new_env, env, sizeof(CPUState));
+
+ /* Preserve chaining and index. */
new_env->next_cpu = next_cpu;
new_env->cpu_index = cpu_index;
+
+ /* Clone all break/watchpoints.
+ Note: Once we support ptrace with hw-debug register access, make sure
+ BP_CPU break/watchpoints are handled correctly on clone. */
+ TAILQ_INIT(&env->breakpoints);
+ TAILQ_INIT(&env->watchpoints);
+#if defined(TARGET_HAS_ICE)
+ TAILQ_FOREACH(bp, &env->breakpoints, entry) {
+ cpu_breakpoint_insert(new_env, bp->pc, bp->flags, NULL);
+ }
+ TAILQ_FOREACH(wp, &env->watchpoints, entry) {
+ cpu_watchpoint_insert(new_env, wp->vaddr, (~wp->len_mask) + 1,
+ wp->flags, NULL);
+ }
+#endif
+
return new_env;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6321] Adopt cpu_copy to new breakpoint API (Jan Kaszka),
Anthony Liguori <=