diff --git a/qemu/cpu-exec.c b/qemu/cpu-exec.c
index 20ddad7b..abc4b7b9 100644
--- a/qemu/cpu-exec.c
+++ b/qemu/cpu-exec.c
@@ -201,7 +201,8 @@ int cpu_exec(struct uc_struct *uc, CPUState *cpu)
                 /* see if we can patch the calling TB. When the TB
                    spans two pages, we cannot safely do a direct
                    jump. */
-                if (next_tb != 0 && tb->page_addr[1] == -1) {
+                if (next_tb != 0 && tb->page_addr[1] == -1
+                    && !qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) {
                     tb_add_jump((TranslationBlock *)(next_tb & ~TB_EXIT_MASK),
                             next_tb & TB_EXIT_MASK, tb);
                 }
diff --git a/qemu/include/qemu/log.h b/qemu/include/qemu/log.h
index 6f9ccdf7..34e35b2d 100644
--- a/qemu/include/qemu/log.h
+++ b/qemu/include/qemu/log.h
@@ -36,6 +36,7 @@ static inline bool qemu_log_enabled(void)
 #define CPU_LOG_RESET      (1 << 9)
 #define LOG_UNIMP          (1 << 10)
 #define LOG_GUEST_ERROR    (1 << 11)
+#define CPU_LOG_TB_NOCHAIN (1 << 13)
 
 /* Returns true if a bit is set in the current loglevel mask
  */