From 68fa057b7c727b2bf19c94a2359c21dd87bd2bd8 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Mon, 12 Feb 2018 15:27:33 -0500
Subject: [PATCH] target-i386: Rename cpu_x86_init() to cpu_x86_init_user()

The function is used only for CONFIG_USER, so make its purpose clear.

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

diff --git a/qemu/target-i386/cpu.c b/qemu/target-i386/cpu.c
index a15548ce..5dd83c95 100644
--- a/qemu/target-i386/cpu.c
+++ b/qemu/target-i386/cpu.c
@@ -1805,7 +1805,7 @@ out:
     return cpu;
 }
 
-X86CPU *cpu_x86_init(struct uc_struct *uc, const char *cpu_model)
+X86CPU *cpu_x86_init_user(struct uc_struct *uc, const char *cpu_model)
 {
     Error *error = NULL;
     X86CPU *cpu;
diff --git a/qemu/target-i386/cpu.h b/qemu/target-i386/cpu.h
index 31591493..705bfb52 100644
--- a/qemu/target-i386/cpu.h
+++ b/qemu/target-i386/cpu.h
@@ -979,7 +979,7 @@ typedef struct CPUX86State {
 
 #include "cpu-qom.h"
 
-X86CPU *cpu_x86_init(struct uc_struct *uc, const char *cpu_model);
+X86CPU *cpu_x86_init_user(struct uc_struct *uc, const char *cpu_model);
 X86CPU *cpu_x86_create(struct uc_struct *uc, const char *cpu_model, Error **errp);
 int cpu_x86_exec(struct uc_struct *uc, CPUX86State *s);
 void x86_cpudef_setup(void);
@@ -1167,7 +1167,7 @@ uint64_t cpu_get_tsc(CPUX86State *env);
 
 static inline CPUX86State *cpu_init(struct uc_struct *uc, const char *cpu_model)
 {
-    X86CPU *cpu = cpu_x86_init(uc, cpu_model);
+    X86CPU *cpu = cpu_x86_init_user(uc, cpu_model);
     if (cpu == NULL) {
         return NULL;
     }