diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2014-12-18 23:05:20 -0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2015-02-25 15:00:07 -0300 |
| commit | 644dba250a3ed04079792f0d6cc918fb1483e6a5 (patch) | |
| tree | 389011fd1a1e268149417520d5a02510b87629a5 | |
| parent | 8a3f75b39db7d2c891d1e91dde5180d3ff9e10f7 (diff) | |
target-i386: Rename cpu_x86_init() to cpu_x86_init_user()
The function is used only for CONFIG_USER, so make its purpose clear.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | target-i386/cpu.c | 2 | ||||
| -rw-r--r-- | target-i386/cpu.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 356f97ea14..8f18556960 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2135,7 +2135,7 @@ out: return cpu; } -X86CPU *cpu_x86_init(const char *cpu_model) +X86CPU *cpu_x86_init_user(const char *cpu_model) { Error *error = NULL; X86CPU *cpu; diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 478450cfb6..41d7f0ac6e 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -982,7 +982,7 @@ typedef struct CPUX86State { #include "cpu-qom.h" -X86CPU *cpu_x86_init(const char *cpu_model); +X86CPU *cpu_x86_init_user(const char *cpu_model); X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge, Error **errp); int cpu_x86_exec(CPUX86State *s); @@ -1173,7 +1173,7 @@ uint64_t cpu_get_tsc(CPUX86State *env); static inline CPUX86State *cpu_init(const char *cpu_model) { - X86CPU *cpu = cpu_x86_init(cpu_model); + X86CPU *cpu = cpu_x86_init_user(cpu_model); if (cpu == NULL) { return NULL; } |