[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH 1/9] target-i386: Move TCG initialization check to tcg_x86_init()



On Fri,  6 May 2016 15:11:24 -0300
Eduardo Habkost <ehabkost redhat com> wrote:

> Instead of requiring cpu.c to check if TCG was already initialized,
> simply let the function be called multiple times.
> 
> Suggested-by: Igor Mammedov <imammedo redhat com>
> Signed-off-by: Eduardo Habkost <ehabkost redhat com>
Reviewed-by: Igor Mammedov <imammedo redhat com>

> ---
>  target-i386/cpu.c       | 4 +---
>  target-i386/translate.c | 6 ++++++
>  2 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 4856cd4..a689fec 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -3087,7 +3087,6 @@ static void x86_cpu_initfn(Object *obj)
>      X86CPUClass *xcc = X86_CPU_GET_CLASS(obj);
>      CPUX86State *env = &cpu->env;
>      FeatureWord w;
> -    static int inited;
>  
>      cs->env_ptr = env;
>      cpu_exec_init(cs, &error_abort);
> @@ -3138,8 +3137,7 @@ static void x86_cpu_initfn(Object *obj)
>      x86_cpu_load_def(cpu, xcc->cpu_def, &error_abort);
>  
>      /* init various static tables used in TCG mode */
> -    if (tcg_enabled() && !inited) {
> -        inited = 1;
> +    if (tcg_enabled()) {
>          tcg_x86_init();
>      }
>  }
> diff --git a/target-i386/translate.c b/target-i386/translate.c
> index 1a1214d..92570b4 100644
> --- a/target-i386/translate.c
> +++ b/target-i386/translate.c
> @@ -8133,6 +8133,12 @@ void tcg_x86_init(void)
>          "bnd0_ub", "bnd1_ub", "bnd2_ub", "bnd3_ub"
>      };
>      int i;
> +    static bool initialized = false;
> +
> +    if (initialized) {
> +        return;
> +    }
> +    initialized = true;
>  
>      cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
>      cpu_cc_op = tcg_global_mem_new_i32(cpu_env,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]