From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NXMkJ-0004aL-5S
	for qemu-devel@nongnu.org; Tue, 19 Jan 2010 17:40:23 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NXMkE-0004Zm-9s
	for qemu-devel@nongnu.org; Tue, 19 Jan 2010 17:40:22 -0500
Received: from [199.232.76.173] (port=43490 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NXMkE-0004ZN-3M
	for qemu-devel@nongnu.org; Tue, 19 Jan 2010 17:40:18 -0500
Received: from mail-qy0-f197.google.com ([209.85.221.197]:40718)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1NXMkD-0004s0-5F
	for qemu-devel@nongnu.org; Tue, 19 Jan 2010 17:40:17 -0500
Received: by mail-qy0-f197.google.com with SMTP id 35so1358126qyk.19
	for <qemu-devel@nongnu.org>; Tue, 19 Jan 2010 14:40:16 -0800 (PST)
Message-ID: <4B5634CE.4080304@codemonkey.ws>
Date: Tue, 19 Jan 2010 16:40:14 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH 1/4] clean up env->current_tb
References: <1263544930-18620-1-git-send-email-pbonzini@redhat.com>
	<1263544930-18620-2-git-send-email-pbonzini@redhat.com>
In-Reply-To: <1263544930-18620-2-git-send-email-pbonzini@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org

On 01/15/2010 02:42 AM, Paolo Bonzini wrote:
> There are three paths from the innermost while loop of cpu_exec
> to the top of the outermost for loop.  Two do not reset
> env->current_tb.  Fix this.
>
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
>    

Applied.  Thanks.

Regards,

Anthony Liguori
> ---
>   cpu-exec.c |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/cpu-exec.c b/cpu-exec.c
> index 6f6ed14..9128df9 100644
> --- a/cpu-exec.c
> +++ b/cpu-exec.c
> @@ -56,6 +56,7 @@ int qemu_cpu_has_work(CPUState *env)
>
>   void cpu_loop_exit(void)
>   {
> +    env->current_tb = NULL;
>       longjmp(env->jmp_env, 1);
>   }
>
> @@ -107,6 +108,7 @@ static void cpu_exec_nocache(int max_cycles, TranslationBlock *orig_tb)
>       env->current_tb = tb;
>       /* execute the generated code */
>       next_tb = tcg_qemu_tb_exec(tb->tc_ptr);
> +    env->current_tb = NULL;
>
>       if ((next_tb&  3) == 2) {
>           /* Restore PC.  This may happen if async event occurs before
>