mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-i386: Let cpu_x86_init() return X86CPU

Browse Source 
Turn cpu_init macro into a static inline function returning CPUX86State
for backwards compatibility.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
This commit is contained in:
Andreas Färber 2012-05-02 18:42:46 +02:00
parent 232fc23bed
commit b47ed9969f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target-i386/cpu.h
View File

@ -787,7 +787,7 @@ typedef struct CPUX86State {
#include "cpu-qom.h" #include "cpu-qom.h"
CPUX86State *cpu_x86_init(const char *cpu_model); X86CPU *cpu_x86_init(const char *cpu_model);
int cpu_x86_exec(CPUX86State *s); int cpu_x86_exec(CPUX86State *s);
void x86_cpu_list (FILE *f, fprintf_function cpu_fprintf, const char *optarg); void x86_cpu_list (FILE *f, fprintf_function cpu_fprintf, const char *optarg);
void x86_cpudef_setup(void); void x86_cpudef_setup(void);
@ -960,7 +960,15 @@ uint64_t cpu_get_tsc(CPUX86State *env);
#define TARGET_VIRT_ADDR_SPACE_BITS 32 #define TARGET_VIRT_ADDR_SPACE_BITS 32
#endif #endif
#define cpu_init cpu_x86_init static inline CPUX86State *cpu_init(const char *cpu_model)
{
X86CPU *cpu = cpu_x86_init(cpu_model);
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
#define cpu_signal_handler cpu_x86_signal_handler #define cpu_signal_handler cpu_x86_signal_handler

4
target-i386/helper.c
View File

@ -1157,7 +1157,7 @@ int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int selector,
return 1; return 1;
} }
CPUX86State *cpu_x86_init(const char *cpu_model) X86CPU *cpu_x86_init(const char *cpu_model)
{ {
X86CPU *cpu; X86CPU *cpu;
CPUX86State *env; CPUX86State *env;
@ -1183,7 +1183,7 @@ CPUX86State *cpu_x86_init(const char *cpu_model)
x86_cpu_realize(OBJECT(cpu), NULL); x86_cpu_realize(OBJECT(cpu), NULL);
return env; return cpu;
} }
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)