From: John Clarke <johnc@kirriwa.net>
Date: Thu, 19 Nov 2015 09:30:50 +0000 (+0100)
Subject: tcg: Fix highwater check
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=644da9b39e477caa80bab69d2847dfcb468f0d33;p=people%2Fpauldu%2Fqemu.git

tcg: Fix highwater check

A simple typo in the variable to use when comparing vs the highwater mark.
Reports are that qemu can in fact segfault occasionally due to this mistake.

Signed-off-by: John Clarke <johnc@kirriwa.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
---

diff --git a/tcg/tcg.c b/tcg/tcg.c
index 682af8a7c6..b20ed19879 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -2443,7 +2443,7 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
            one operation beginning below the high water mark cannot overrun
            the buffer completely.  Thus we can test for overflow after
            generating code without having to check during generation.  */
-        if (unlikely(s->code_gen_ptr > s->code_gen_highwater)) {
+        if (unlikely((void *)s->code_ptr > s->code_gen_highwater)) {
             return -1;
         }
     }