From 2c8187434f90fceb20ee1f0031fb591e5382674d Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Fri, 27 Sep 2013 22:29:17 +0400 Subject: exec: fix breakpoint_invalidate when pc may not be translated 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: qemu-stable@nongnu.org Signed-off-by: Max Filippov Reviewed-by: Paolo Bonzini (cherry picked from commit e8262a1b5b7cfbcbc80c46e4ce6ff7c517b7b2f6) Signed-off-by: Michael Roth --- exec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index f6674e5bff..667a718174 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 */ -- cgit v1.2.1