Re: [Qemu-devel] [PATCH v11 02/29] cpu-exec: Avoid global variables in icount-related functions

[Emilio G. Cota]

On Wed, Jun 28, 2017 at 15:24:44 +0300, Lluís Vilanova wrote:
> Signed-off-by: Lluís Vilanova <address@hidden>
> ---
(snip)
> @@ -62,14 +62,14 @@ static void gen_tb_end(TranslationBlock *tb, int 
> num_insns)
>  static inline void gen_io_start(void)
>  {
>      TCGv_i32 tmp = tcg_const_i32(1);
> -    tcg_gen_st_i32(tmp, cpu_env, -ENV_OFFSET + offsetof(CPUState, 
> can_do_io));
> +    tcg_gen_st_i32(tmp, tcg_ctx.tcg_env, -ENV_OFFSET + offsetof(CPUState, 
> can_do_io));
>      tcg_temp_free_i32(tmp);
>  }
>  
>  static inline void gen_io_end(void)
>  {
>      TCGv_i32 tmp = tcg_const_i32(0);
> -    tcg_gen_st_i32(tmp, cpu_env, -ENV_OFFSET + offsetof(CPUState, 
> can_do_io));
> +    tcg_gen_st_i32(tmp, tcg_ctx.tcg_env, -ENV_OFFSET + offsetof(CPUState, 
> can_do_io));
>      tcg_temp_free_i32(tmp);

If you break these long lines as in this patch, you'll avoid a merge
conflict with it (it's been queued):
  [PATCH v2 2/2] gen-icount: use tcg_ctx.tcg_env instead of cpu_env
  https://patchwork.kernel.org/patch/9793381/

Or just pick up that patch verbatim.

                E.