qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH 22/32] exec: fix breakpoint_invalidate when pc may n


From: Michael Roth
Subject: [Qemu-devel] [PATCH 22/32] exec: fix breakpoint_invalidate when pc may not be translated
Date: Wed, 4 Dec 2013 08:34:29 -0600

From: Max Filippov <address@hidden>

This fixes qemu abort with the following message:

    include/qemu/int128.h:22: int128_get64: Assertion `!a.hi' failed.

which happens due to attempt to invalidate breakpoint by virtual address
for which get_phys_page_debug couldn't find mapping.

For more details see
http://lists.nongnu.org/archive/html/qemu-devel/2013-09/msg04582.html

Cc: address@hidden
Signed-off-by: Max Filippov <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
(cherry picked from commit e8262a1b5b7cfbcbc80c46e4ce6ff7c517b7b2f6)

Signed-off-by: Michael Roth <address@hidden>
---
 exec.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/exec.c b/exec.c
index f6674e5..667a718 100644
--- a/exec.c
+++ b/exec.c
@@ -425,8 +425,10 @@ static void breakpoint_invalidate(CPUState *cpu, 
target_ulong pc)
 #else
 static void breakpoint_invalidate(CPUState *cpu, target_ulong pc)
 {
-    tb_invalidate_phys_addr(cpu_get_phys_page_debug(cpu, pc) |
-            (pc & ~TARGET_PAGE_MASK));
+    hwaddr phys = cpu_get_phys_page_debug(cpu, pc);
+    if (phys != -1) {
+        tb_invalidate_phys_addr(phys | (pc & ~TARGET_PAGE_MASK));
+    }
 }
 #endif
 #endif /* TARGET_HAS_ICE */
-- 
1.7.9.5




reply via email to

[Prev in Thread] Current Thread [Next in Thread]