From baf37a04ad9450b43ac1d090e879b0077d600635 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Sun, 18 Feb 2018 22:55:52 -0500
Subject: [PATCH] target-i386: Rename optimize_flags_init()

Rename the function so that the reason for its existence is
clearer: it does x86-specific initialization of TCG structures.

Backports commit 63618b4ed48f0fc2a7a3fd1117e2f0b512248dab from qemu
---
 qemu/target-i386/cpu.c       | 5 +++--
 qemu/target-i386/cpu.h       | 2 +-
 qemu/target-i386/translate.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/qemu/target-i386/cpu.c b/qemu/target-i386/cpu.c
index 023d989a..19aa2bcf 100644
--- a/qemu/target-i386/cpu.c
+++ b/qemu/target-i386/cpu.c
@@ -2677,8 +2677,9 @@ static void x86_cpu_initfn(struct uc_struct *uc, Object *obj, void *opaque)
     x86_cpu_load_def(cpu, xcc->cpu_def, &error_abort);
 
     /* init various static tables used in TCG mode */
-    if (tcg_enabled(env->uc))
-        optimize_flags_init(env->uc);
+    if (tcg_enabled(env->uc)) {
+        tcg_x86_init(env->uc);
+    }
 }
 
 static int64_t x86_cpu_get_arch_id(CPUState *cs)
diff --git a/qemu/target-i386/cpu.h b/qemu/target-i386/cpu.h
index 1042e49f..635c0f81 100644
--- a/qemu/target-i386/cpu.h
+++ b/qemu/target-i386/cpu.h
@@ -1219,7 +1219,7 @@ static inline target_long lshift(target_long x, int n)
 #define ST1    ST(1)
 
 /* translate.c */
-void optimize_flags_init(struct uc_struct *);
+void tcg_x86_init(struct uc_struct *);
 
 #include "exec/cpu-all.h"
 #include "svm.h"
diff --git a/qemu/target-i386/translate.c b/qemu/target-i386/translate.c
index 1760dfd4..94357581 100644
--- a/qemu/target-i386/translate.c
+++ b/qemu/target-i386/translate.c
@@ -8524,7 +8524,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
     return s->pc;
 }
 
-void optimize_flags_init(struct uc_struct *uc)
+void tcg_x86_init(struct uc_struct *uc)
 {
     static const char reg_names[CPU_NB_REGS][4] = {
 #ifdef TARGET_X86_64