ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-i386: Eliminate cpu_init() function 

Instead of putting extra logic inside cpu.h, just do everything inside
cpu_x86_init_user().

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2014-12-18 23:07:01 -02:00
parent 644dba250a
commit 15258d46ba
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target-i386/cpu.c
View File

@ -2135,7 +2135,7 @@ out:
return cpu; return cpu;
} }
X86CPU *cpu_x86_init_user(const char *cpu_model) CPUX86State *cpu_x86_init_user(const char *cpu_model)
{ {
Error *error = NULL; Error *error = NULL;
X86CPU *cpu; X86CPU *cpu;
@ -2153,10 +2153,10 @@ out:
error_free(error); error_free(error);
if (cpu != NULL) { if (cpu != NULL) {
object_unref(OBJECT(cpu)); object_unref(OBJECT(cpu));
cpu = NULL;
} }
return NULL;
} }
return cpu; return &cpu->env;
} }
static void x86_cpu_cpudef_class_init(ObjectClass *oc, void *data) static void x86_cpu_cpudef_class_init(ObjectClass *oc, void *data)

12
target-i386/cpu.h
View File

@ -982,7 +982,6 @@ typedef struct CPUX86State {
#include "cpu-qom.h" #include "cpu-qom.h"
X86CPU *cpu_x86_init_user(const char *cpu_model);
X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge, X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge,
Error **errp); Error **errp);
int cpu_x86_exec(CPUX86State *s); int cpu_x86_exec(CPUX86State *s);
@ -1171,14 +1170,9 @@ uint64_t cpu_get_tsc(CPUX86State *env);
# define PHYS_ADDR_MASK 0xfffffffffLL # define PHYS_ADDR_MASK 0xfffffffffLL
# endif # endif
static inline CPUX86State *cpu_init(const char *cpu_model) /* CPU creation function for *-user */
{ CPUX86State *cpu_x86_init_user(const char *cpu_model);
X86CPU *cpu = cpu_x86_init_user(cpu_model); #define cpu_init cpu_x86_init_user
if (cpu == NULL) {
return NULL;
}
return &cpu->env;
}
#define cpu_exec cpu_x86_exec #define cpu_exec cpu_x86_exec
#define cpu_gen_code cpu_x86_gen_code #define cpu_gen_code cpu_x86_gen_code