Revision 564b863d target-s390x/cpu.h

b/target-s390x/cpu.h
105 105
    QEMUTimer *cpu_timer;
106 106
} CPUS390XState;
107 107

  
108
#include "cpu-qom.h"
109

  
108 110
#if defined(CONFIG_USER_ONLY)
109 111
static inline void cpu_clone_regs(CPUS390XState *env, target_ulong newsp)
110 112
{
......
271 273
#define ILC_LATER_INC_2 0x22
272 274

  
273 275

  
274
CPUS390XState *cpu_s390x_init(const char *cpu_model);
276
S390CPU *cpu_s390x_init(const char *cpu_model);
275 277
void s390x_translate_init(void);
276 278
int cpu_s390x_exec(CPUS390XState *s);
277 279
void cpu_s390x_close(CPUS390XState *s);
......
340 342
    env->aregs[1] = newtls & 0xffffffffULL;
341 343
}
342 344

  
343
#define cpu_init cpu_s390x_init
345
#define cpu_init(model) (&cpu_s390x_init(model)->env)
344 346
#define cpu_exec cpu_s390x_exec
345 347
#define cpu_gen_code cpu_s390x_gen_code
346 348
#define cpu_signal_handler cpu_s390x_signal_handler
......
994 996
    env->psw.addr = tb->pc;
995 997
}
996 998

  
997
#include "cpu-qom.h"
998

  
999 999
#endif

Also available in: Unified diff